]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
* '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()

1  2  3  4 
drivers/char/nvram.c

Simple merge