git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15e957d e0e4214)
Merge branch 'x86/apic' into irq/numa
authorIngo Molnar <mingo@elte.hu>
Fri, 1 May 2009 17:02:50 +0000 (19:02 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 1 May 2009 17:02:50 +0000 (19:02 +0200)
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>

Trivial merge
Pandora Kernel Repository