94441c3bd99287b9d84f148a08cc9a44675ec749
author Joerg Roedel <joerg.roedel@amd.com> 1319200735 +0200
committer Joerg Roedel <joerg.roedel@amd.com> 1319200735 +0200

Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/iommu.c
Æ̾G˜