Merge git://git.infradead.org/iommu-2.6
commitffa009c366e33f3eae48bba2547051fe15795f64
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Apr 2009 21:26:05 +0000 (6 14:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 6 Apr 2009 21:26:05 +0000 (6 14:26 -0700)
tree78736a4ee7c16819830a32a313867e3a88ac6aff
parent8e320d02718d2872d52ef88a69a493e420494269
parent46f06b72378d3187f0d12f7a60d020676bfbf332
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
arch/x86/Kconfig