summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-26 12:19:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-26 12:19:11 -0700
commitfce637e392a762e4d4f0fc41ac3d3f557187ac21 (patch)
tree1604486289418bf35ae4ba9bddb35bb4c6f83ba7 /arch/ia64
parent8b29336fe01dab3541ebb283daddf9d0168c3f05 (diff)
parentc4dbe54ed7296ac3249c415d512dd6d649f66f4b (diff)
parentdef945eeb920b94e710574454043f080831aefe5 (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