]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branches 'futexes-for-linus', 'irq-core-for-linus' and 'bkl-drivers-for-linus...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Mar 2010 16:51:52 +0000 (08:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Mar 2010 16:51:52 +0000 (08:51 -0800)
commit0f4533979473a456a8adb3869365e12c7a99cf65
treec01f72c6d70f57ae80643f4c9d4923ad6f807af7
parente56425b135a8892d1e71ad5bb605d12c10efeb32
parentf409adf5b1db55ece7e80b67a944f9c0d3fe93e9
parent599faa0e264fe2e7f563f87b4aad8c83e9dc46d1
parent83cb16727085b18191f45eb0ede6bf1f97d67a7a
Merge branches 'futexes-for-linus', 'irq-core-for-linus' and 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: Protect pid lookup in compat code with RCU

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix documentation of default chip disable()

* 'bkl-drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  nvram: Drop the BKL from nvram_open()
drivers/char/nvram.c