tree 93f74ca002f5756c8e157611174f9540b5cf41c0
parent b9c61b70075c87a8612624736faf4a2de5b1ed30
parent cec6be6d1069d697beb490bbb40a290d5ff554a2
author Ingo Molnar <mingo@elte.hu> 1242123450 +0200
committer Ingo Molnar <mingo@elte.hu> 1242123456 +0200

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>