Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup' and ...
authorIngo Molnar <mingo@elte.hu>
Tue, 24 Mar 2009 14:19:45 +0000 (15:19 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 24 Mar 2009 14:19:45 +0000 (15:19 +0100)
1  2  3  4  5  6  7 
Makefile
arch/x86/kernel/apic/io_apic.c

diff --cc Makefile
Simple merge
index d882c03604eea510fdaba8edf313b4e61154c619,ea97e5efa907d651b0112faf3d9fbd8fdcb051fe,42cdc78427a2ba6643823969e11b238eb4739a9d,42cdc78427a2ba6643823969e11b238eb4739a9d,42cdc78427a2ba6643823969e11b238eb4739a9d,42cdc78427a2ba6643823969e11b238eb4739a9d,bc7ac4da90d745a04fc85026c5a6e3f1663263f9..86827d85488a7cd4d8317d611eaa2c789776e046
@@@@@@@@ -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;