From: Linus Torvalds Date: Mon, 24 Oct 2011 05:08:24 +0000 (+0200) Subject: Merge git://git.infradead.org/iommu-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6a0596583fadd15dca293736114abdea306d3d7c;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge git://git.infradead.org/iommu-2.6 * git://git.infradead.org/iommu-2.6: intel-iommu: fix superpage support in pfn_to_dma_pte() intel-iommu: set iommu_superpage on VM domains to lowest common denominator intel-iommu: fix return value of iommu_unmap() API MAINTAINERS: Update VT-d entry for drivers/pci -> drivers/iommu move intel-iommu: Export a flag indicating that the IOMMU is used for iGFX. intel-iommu: Workaround IOTLB hang on Ironlake GPU intel-iommu: Fix AB-BA lockdep report --- 6a0596583fadd15dca293736114abdea306d3d7c