diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 17:51:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 17:51:52 +0100 |
| commit | 0f4533979473a456a8adb3869365e12c7a99cf65 (patch) | |
| tree | c01f72c6d70f57ae80643f4c9d4923ad6f807af7 /drivers/char/nvram.c | |
| parent | Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | futex: Protect pid lookup in compat code with RCU (diff) | |
| parent | genirq: Fix documentation of default chip disable() (diff) | |
| parent | nvram: Drop the BKL from nvram_open() (diff) | |
| download | linux-0f4533979473a456a8adb3869365e12c7a99cf65.tar.xz linux-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()