summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-11-03 12:05:40 +0100
committerJoerg Roedel <joerg.roedel@amd.com>2009-11-03 12:05:40 +0100
commit342688f9db392ec82ab9e6b25a6137f9ee1647d7 (patch)
treee55eca548851778a559674e467e34574ae2c633a /arch
parent012abeea669ea49636cf952d13298bb68654146a (diff)
parentca0207114f1708b563f510b7781a360ec5b98359 (diff)
parent59a40e70458341b35d123b60aca416a1d97ebbe3 (diff)
Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes