aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 11:51:52 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 11:51:52 -0500
commit0f4533979473a456a8adb3869365e12c7a99cf65 (patch)
treec01f72c6d70f57ae80643f4c9d4923ad6f807af7 /sound/soc
parente56425b135a8892d1e71ad5bb605d12c10efeb32 (diff)
parentf409adf5b1db55ece7e80b67a944f9c0d3fe93e9 (diff)
parent599faa0e264fe2e7f563f87b4aad8c83e9dc46d1 (diff)
parent83cb16727085b18191f45eb0ede6bf1f97d67a7a (diff)
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()