Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm...
authorJoerg Roedel <joro@8bytes.org>
Thu, 2 May 2013 10:10:19 +0000 (12:10 +0200)
committerJoerg Roedel <joro@8bytes.org>
Thu, 2 May 2013 10:10:19 +0000 (12:10 +0200)
commit0c4513be3d01a854867446ee793748409cc0ebdf
tree08648dc4fa179e33b82758b9927b46ea6ac1564f
parentae3e7f3aba4441eca7a1ff5cb3e089824318ba79
parent83ed9c13e37e352b5a16caca01798c2766d91c29
parent80f97f0f73b82444f714651ea053838d27779dca
parentaa16bea929aed6ea854b55d2be8306a9fb40e694
parent72ca55dbae815745403364ad915d912e92da5b9a
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next
Documentation/kernel-parameters.txt
drivers/iommu/amd_iommu.c
drivers/iommu/intel-iommu.c
drivers/iommu/iommu.c
drivers/iommu/irq_remapping.c
drivers/iommu/tegra-gart.c
drivers/iommu/tegra-smmu.c
include/linux/iommu.h