Merge branches 'dma-debug/fixes' and 'amd-iommu/fixes' into iommu/fixes
Joerg Roedel [Mon, 21 Dec 2009 14:58:19 +0000 (15:58 +0100)]

Trivial merge