git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9c61b7 cec6be6)
Merge branch 'x86/apic' into irq/numa
authorIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 10:17:30 +0000 (12:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 12 May 2009 10:17:36 +0000 (12:17 +0200)
Merge reason: both topics modify the APIC code but were able to do it in
              parallel so far. An upcoming patch generates a conflict so
              merge them to avoid the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge
Pandora Kernel Repository