b388820a237288
author Joerg Roedel <joerg.roedel@amd.com> 1349181603 +0200
committer Joerg Roedel <joerg.roedel@amd.com> 1349181603 +0200

Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next

Conflicts:
	drivers/iommu/amd_iommu_init.c
'เฟ9