summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-06 01:51:21 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-06 01:51:21 +0100
commitf14aa871c7e1e58a01bf33a562ac314fae64517c (patch)
tree5ab1459c3f372dbb765c69808eb8300749eba6c7 /kernel
parentMerge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff)
parentslab, lockdep: Fix silly bug (diff)
parentgenirq: Fix race condition when stopping the irq thread (diff)
downloadlinux-f14aa871c7e1e58a01bf33a562ac314fae64517c.tar.xz
linux-f14aa871c7e1e58a01bf33a562ac314fae64517c.zip
Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: slab, lockdep: Fix silly bug * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Fix race condition when stopping the irq thread