diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-06 01:51:21 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-06 01:51:21 +0100 |
commit | f14aa871c7e1e58a01bf33a562ac314fae64517c (patch) | |
tree | 5ab1459c3f372dbb765c69808eb8300749eba6c7 /kernel | |
parent | Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | slab, lockdep: Fix silly bug (diff) | |
parent | genirq: Fix race condition when stopping the irq thread (diff) | |
download | linux-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