| commit | 4420471f14b79f2a42e4603be7794ea49b68bca4 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri May 01 19:02:50 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri May 01 19:02:50 2009 +0200 |
| tree | d391d25458bc0aa86dcf2823fd6c1464883b0533 | |
| parent | 15e957d08dd4a841359cfec59ecb74041e0097aa [diff] | |
| parent | e0e42142bab96404de535cceb85d6533d5ad7942 [diff] |
Merge branch 'x86/apic' into irq/numa
Conflicts:
arch/x86/kernel/apic/io_apic.c
Merge reason: non-trivial interaction between ongoing work in io_apic.c
and the NUMA migration feature in the irq tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>