]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 12:49:17 +0000 (13:49 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 12:49:24 +0000 (13:49 +0100)
commit8299608f140ae321e4eb5d1306184265d2b9511e
tree830ad1dc2e79c2dcaf8b89e31c51dcc1ee5adf89
parent45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df
parent30cb367ea2be76bf71dbd275f38d0fd3b6f4142b
parent69b88afa8d114a43a3c0431722b79e31d9920692
parent8daa19051e1c7369c89ace7b18e74fe1f55dfa29
Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096

We merge the irq/sparseirq, x86/quirks and x86/reboot trees into the
cpus4096 tree because the io-apic changes in the sparseirq change
conflict with the cpumask changes in the cpumask tree, and we
want to resolve those.
arch/x86/Kconfig
arch/x86/kernel/process.c
arch/x86/kernel/reboot.c
arch/x86/kernel/setup.c
init/main.c