Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-linus...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 17:33:08 +0000 (10:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 17:33:08 +0000 (10:33 -0700)
commitc0c463d34adf0c150e5e24fa412fa23f3f7ddc27
treedfdf2ee7c6bb6662e8aa750c9145618085b092fd
parente72542191cbba4cf7fda21cb22e26b42d7415daf
parenta03fc8c375511b6ab43184ab191af3218a919646
parentf505c553dbe24b18a8590eb0eb5890a839acd0c3
parenta7de915383a6d5c05663f9badbd10d5a87bc1586
parent08a4a43fc407d780bdde36d98f89c0dbb2a6be6b
Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-linus' and 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  um: Make rwsem.S depend on CONFIG_RWSEM_XCHGADD_ALGORITHM

* 'core-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  debug: Make CONFIG_EXPERT select CONFIG_DEBUG_KERNEL to unhide debug options

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Remove unused CHECK_IRQ_PER_CPU()

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools, x86: Fix 32-bit compile on 64-bit system
include/linux/irq.h
init/Kconfig
tools/perf/Makefile