diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 10:33:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 10:33:08 -0700 |
| commit | c0c463d34adf0c150e5e24fa412fa23f3f7ddc27 (patch) | |
| tree | dfdf2ee7c6bb6662e8aa750c9145618085b092fd /arch/um/Makefile-skas | |
| parent | e72542191cbba4cf7fda21cb22e26b42d7415daf (diff) | |
| parent | a03fc8c375511b6ab43184ab191af3218a919646 (diff) | |
| parent | f505c553dbe24b18a8590eb0eb5890a839acd0c3 (diff) | |
| parent | a7de915383a6d5c05663f9badbd10d5a87bc1586 (diff) | |
| parent | 08a4a43fc407d780bdde36d98f89c0dbb2a6be6b (diff) | |
Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-linus' and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/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