Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup' and ...

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/apic/io_apic.c
index d882c03,ea97e5e,42cdc78,42cdc78,42cdc78,42cdc78,bc7ac4d..86827d8
--- 1/arch/x86/kernel/apic/io_apic.c
--- 2/arch/x86/kernel/apic/io_apic.c
--- 3/arch/x86/kernel/apic/io_apic.c
--- 4/arch/x86/kernel/apic/io_apic.c
--- 5/arch/x86/kernel/apic/io_apic.c
--- 6/arch/x86/kernel/apic/io_apic.c
--- 7/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@@@@@@@ -3464,8 -3464,8 -3464,8 -3464,8 -3464,8 -3464,8 -3504,11 +3464,8 @@@@@@@@ int arch_setup_msi_irqs(struct pci_dev 
        int ret, sub_handle;
        struct msi_desc *msidesc;
        unsigned int irq_want;
      -
      -#ifdef CONFIG_INTR_REMAP
- ----- struct intel_iommu *iommu = 0;
+ +++++ struct intel_iommu *iommu = NULL;
        int index = 0;
      -#endif
       
        irq_want = nr_irqs_gsi;
        sub_handle = 0;