]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 May 2011 21:44:10 +0000 (06:44 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 May 2011 21:44:10 +0000 (06:44 +0900)
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] wire up sendmmsg() syscall for Itanium


Trivial merge