diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 21:19:11 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 21:19:11 +0200 |
commit | fce637e392a762e4d4f0fc41ac3d3f557187ac21 (patch) | |
tree | 1604486289418bf35ae4ba9bddb35bb4c6f83ba7 /net | |
parent | Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
parent | seqlock: Get rid of SEQLOCK_UNLOCKED (diff) | |
parent | irq: Remove smp_affinity_list when unregister irq proc (diff) | |
download | linux-fce637e392a762e4d4f0fc41ac3d3f557187ac21.tar.xz linux-fce637e392a762e4d4f0fc41ac3d3f557187ac21.zip |
Merge branches 'core-fixes-for-linus' and 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
seqlock: Get rid of SEQLOCK_UNLOCKED
* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
irq: Remove smp_affinity_list when unregister irq proc