From: Linus Torvalds Date: Mon, 6 Apr 2009 21:26:05 +0000 (-0700) Subject: Merge git://git.infradead.org/iommu-2.6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ffa009c366e33f3eae48bba2547051fe15795f64;p=linux-2.6-omap-h63xx.git 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 --- ffa009c366e33f3eae48bba2547051fe15795f64