diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 13:49:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 13:49:24 +0100 |
| commit | 8299608f140ae321e4eb5d1306184265d2b9511e (patch) | |
| tree | 830ad1dc2e79c2dcaf8b89e31c51dcc1ee5adf89 /arch/m32r | |
| parent | Merge branch 'sched/core' into cpus4096 (diff) | |
| parent | sparse irqs: add irqnr.h to the user headers list (diff) | |
| parent | x86: clean up get_smp_config() (diff) | |
| parent | x86, apm: remove CONFIG_APM_REAL_MODE_POWER_OFF in favor of a kernel parameter (diff) | |
| download | linux-8299608f140ae321e4eb5d1306184265d2b9511e.tar.xz linux-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.