aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/nvram.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 08:51:52 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 08:51:52 -0800
commit0f4533979473a456a8adb3869365e12c7a99cf65 (patch)
treec01f72c6d70f57ae80643f4c9d4923ad6f807af7 /drivers/char/nvram.c
parentMerge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff)
parentfutex: Protect pid lookup in compat code with RCU (diff)
parentgenirq: Fix documentation of default chip disable() (diff)
parentnvram: Drop the BKL from nvram_open() (diff)
downloadlinux-dev-0f4533979473a456a8adb3869365e12c7a99cf65.tar.xz
linux-dev-0f4533979473a456a8adb3869365e12c7a99cf65.zip
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()