Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/dmar.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pci/dmar.c
index 7b3751136e63734054d3f53a84ec52f256cb463c,8b29c307f1a11c0b94fe4e3214f6b62faf9c5063..691b3adeb87057799841f112d8b77797e729e4ce
--- 1/drivers/pci/dmar.c
--- 2/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@@ -453,10 -458,10 +458,10 @@@ void __init detect_intel_iommu(void
  {
        int ret;
  
-       ret = early_dmar_detect();
+       ret = dmar_table_detect();
  
 -#ifdef CONFIG_DMAR
        {
 +#ifdef CONFIG_INTR_REMAP
                struct acpi_table_dmar *dmar;
                /*
                 * for now we will disable dma-remapping when interrupt
@@@ -469,14 -474,26 +474,14 @@@
                        printk(KERN_INFO
                               "Queued invalidation will be enabled to support "
                               "x2apic and Intr-remapping.\n");
 -                      printk(KERN_INFO
 -                             "Disabling IOMMU detection, because of missing "
 -                             "queued invalidation support for IOTLB "
 -                             "invalidation\n");
 -                      printk(KERN_INFO
 -                             "Use \"nox2apic\", if you want to use Intel "
 -                             " IOMMU for DMA-remapping and don't care about "
 -                             " x2apic support\n");
 -
 -                      dmar_disabled = 1;
 -                      goto end;
 -              }
 -
 +#endif
- 
 +#ifdef CONFIG_DMAR
                if (ret && !no_iommu && !iommu_detected && !swiotlb &&
                    !dmar_disabled)
                        iommu_detected = 1;
 -      }
 -end:
  #endif
 +      }
+       dmar_tbl = NULL;
  }
  
  

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