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>

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc drivers/pci/htirq.c
Simple merge

diff --cc kernel/irq/handle.c
Simple merge