aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-12 13:49:17 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-12 13:49:24 +0100
commit8299608f140ae321e4eb5d1306184265d2b9511e (patch)
tree830ad1dc2e79c2dcaf8b89e31c51dcc1ee5adf89 /init
parent45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df (diff)
parent30cb367ea2be76bf71dbd275f38d0fd3b6f4142b (diff)
parent69b88afa8d114a43a3c0431722b79e31d9920692 (diff)
parent8daa19051e1c7369c89ace7b18e74fe1f55dfa29 (diff)
downloadmrst-s0i3-test-8299608f140ae321e4eb5d1306184265d2b9511e.tar.gz
mrst-s0i3-test-8299608f140ae321e4eb5d1306184265d2b9511e.tar.xz
mrst-s0i3-test-8299608f140ae321e4eb5d1306184265d2b9511e.zip
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.