tree 6f77339f0d25d429f767833e09cdb0f60b8ff5ec
parent 899e3ee404961a90b828ad527573aaaac39f0ab1
parent fcd0861db1cf4e6ed99f60a815b7b72c2ed36ea4
parent e4efd94bde1a2df9f1344ff936d42b4a78b9acc0
parent 0ed6d2d27bcc2ace454a8c55446e1bc3efd2d529
parent 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