diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-05 16:51:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-05 16:51:21 -0800 |
| commit | f14aa871c7e1e58a01bf33a562ac314fae64517c (patch) | |
| tree | 5ab1459c3f372dbb765c69808eb8300749eba6c7 /drivers/rtc | |
| parent | 7125faceabe43067293d0c9e2ef7154ecea51721 (diff) | |
| parent | 52cef189165d74a5d6030184a8e05595194c69ca (diff) | |
| parent | 550acb19269d65f32e9ac4ddb26c2b2070e37f1c (diff) | |
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