From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Jul 2011 17:33:08 +0000 (-0700)
Subject: Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-linus... 
X-Git-Tag: MMI-PSA29.97-13-9~18893
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0c463d34adf0c150e5e24fa412fa23f3f7ddc27;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

c0c463d34adf0c150e5e24fa412fa23f3f7ddc27