Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  drivers/pci/intr_remapping.c: include acpi.h
  intel-iommu: Fix oops in device_to_iommu() when devices not found.
  intel-iommu: Handle PCI domains appropriately.
  intel-iommu: Fix device-to-iommu mapping for PCI-PCI bridges.
  x2apic/intr-remap: decouple interrupt remapping from x2apic
  x86, dmar: check if it's initialized before disable queue invalidation
  intel-iommu: set compatibility format interrupt
  Intel IOMMU Suspend/Resume Support - Interrupt Remapping
  Intel IOMMU Suspend/Resume Support - Queued Invalidation
  Intel IOMMU Suspend/Resume Support - DMAR
  intel-iommu: Add for_each_iommu() and for_each_active_iommu() macros

diff --combined arch/x86/Kconfig
index 5b2196ab8168def9b8b44cc060877130d7b633bc,229cf611d6ffde70d9235660565f557c910c4568..4b34082060914efd6d47b73ff3474cfc7f9a871c
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -34,8 -34,6 +34,8 @@@ config X8
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
 +      select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
 +      select HAVE_FTRACE_SYSCALLS
        select HAVE_KVM
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
@@@ -253,6 -251,7 +253,7 @@@ config SM
  config X86_X2APIC
        bool "Support x2apic"
        depends on X86_LOCAL_APIC && X86_64
+       select INTR_REMAP
        ---help---
          This enables x2apic support on CPUs that have this feature.
  
@@@ -1146,7 -1145,7 +1147,7 @@@ config NODES_SHIF
        depends on NEED_MULTIPLE_NODES
        ---help---
          Specify the maximum number of NUMA Nodes available on the target
 -        system.  Increases memory reserved to accomodate various tables.
 +        system.  Increases memory reserved to accommodate various tables.
  
  config HAVE_ARCH_BOOTMEM
        def_bool y
@@@ -1324,7 -1323,7 +1325,7 @@@ config MTRR_SANITIZE
          add writeback entries.
  
          Can be disabled with disable_mtrr_cleanup on the kernel command line.
 -        The largest mtrr entry size for a continous block can be set with
 +        The largest mtrr entry size for a continuous block can be set with
          mtrr_chunk_size.
  
          If unsure, say Y.
@@@ -1881,7 -1880,6 +1882,6 @@@ config DMAR_FLOPPY_W
  config INTR_REMAP
        bool "Support for Interrupt Remapping (EXPERIMENTAL)"
        depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
-       select X86_X2APIC
        ---help---
          Supports Interrupt remapping for IO-APIC and MSI devices.
          To use x2apic mode in the CPU's which support x2APIC enhancements or