Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes
Joerg Roedel [Fri, 22 Jan 2010 17:00:41 +0000 (18:00 +0100)]
1  2 
lib/dma-debug.c

diff --cc lib/dma-debug.c
Simple merge