summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2011-10-21 14:38:55 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2011-10-21 14:38:55 +0200
commit1abb4ba596a91a839f82e0c9c837b777d574e83d (patch)
tree6f77339f0d25d429f767833e09cdb0f60b8ff5ec
parent899e3ee404961a90b828ad527573aaaac39f0ab1 (diff)
parentfcd0861db1cf4e6ed99f60a815b7b72c2ed36ea4 (diff)
parente4efd94bde1a2df9f1344ff936d42b4a78b9acc0 (diff)
parent0ed6d2d27bcc2ace454a8c55446e1bc3efd2d529 (diff)
parent94441c3bd99287b9d84f148a08cc9a44675ec749 (diff)
downloadlinux-1abb4ba596a91a839f82e0c9c837b777d574e83d.tar.gz
linux-1abb4ba596a91a839f82e0c9c837b777d574e83d.tar.bz2
linux-1abb4ba596a91a839f82e0c9c837b777d574e83d.zip
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