diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 12:19:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 12:19:11 -0700 |
| commit | fce637e392a762e4d4f0fc41ac3d3f557187ac21 (patch) | |
| tree | 1604486289418bf35ae4ba9bddb35bb4c6f83ba7 /arch/ia64 | |
| parent | 8b29336fe01dab3541ebb283daddf9d0168c3f05 (diff) | |
| parent | c4dbe54ed7296ac3249c415d512dd6d649f66f4b (diff) | |
| parent | def945eeb920b94e710574454043f080831aefe5 (diff) | |
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