]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2009 18:25:00 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2009 18:25:00 +0000 (11:25 -0700)
* 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: request only one page from get_user_pages()


Trivial merge