diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-01 19:02:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-01 19:02:50 +0200 |
| commit | 4420471f14b79f2a42e4603be7794ea49b68bca4 (patch) | |
| tree | d391d25458bc0aa86dcf2823fd6c1464883b0533 /.gitignore | |
| parent | 15e957d08dd4a841359cfec59ecb74041e0097aa (diff) | |
| parent | e0e42142bab96404de535cceb85d6533d5ad7942 (diff) | |
| download | blackbird-op-linux-4420471f14b79f2a42e4603be7794ea49b68bca4.tar.gz blackbird-op-linux-4420471f14b79f2a42e4603be7794ea49b68bca4.zip | |
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>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions
