Merge remote-tracking branch 'iommu/next'

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c
	include/linux/pci_regs.h

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/media/video/omap3isp/ispccdc.c
Simple merge

diff --cc drivers/media/video/omap3isp/ispstat.c
Simple merge

diff --cc drivers/media/video/omap3isp/ispvideo.c
Simple merge

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

diff --cc drivers/pci/hotplug/acpiphp_glue.c
index 9ddf69e3bbef03487e12ea814be79bb3258fc0fa,ba43c037de80c314e9e7ec6720ec96da50c6b892..4b61b4052963a256165d4e4e495260974a57b700
--- 1/drivers/pci/hotplug/acpiphp_glue.c
--- 2/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@@ -132,18 -132,6 +132,18 @@@ register_slot(acpi_handle handle, u32 l
        if (!acpi_pci_check_ejectable(pbus, handle) && !is_dock_device(handle))
                return AE_OK;
  
-                                       OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
 +      pdev = pbus->self;
 +      if (pdev && pci_is_pcie(pdev)) {
 +              tmp = acpi_find_root_bridge_handle(pdev);
 +              if (tmp) {
 +                      struct acpi_pci_root *root = acpi_pci_find_root(tmp);
 +
 +                      if (root && (root->osc_control_set &
++                                      OSC_PCI_NATIVE_HOTPLUG))
 +                              return AE_OK;
 +              }
 +      }
 +
        acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
        device = (adr >> 16) & 0xffff;
        function = adr & 0xffff;

diff --cc include/linux/pci_regs.h
Simple merge