projects / platform / kernel / linux-3.10.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit6cda3eb62ef42aa5acd649bf99c8db544e0f4051
tree93f74ca002f5756c8e157611174f9540b5cf41c0tree | snapshot
parentb9c61b70075c87a8612624736faf4a2de5b1ed30commit | diff
parentcec6be6d1069d697beb490bbb40a290d5ff554a2commit | diff
Merge branch 'x86/apic' into irq/numa

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>
arch/x86/kernel/apic/io_apic.c diff1 | diff2 | blob | history
drivers/pci/htirq.c diff1 | diff2 | blob | history
kernel/irq/handle.c diff1 | diff2 | blob | history
Domain: System / Kernel;