Merge commit 'v2.6.30-rc5' into core/iommu
Ingo Molnar [Mon, 11 May 2009 12:44:27 +0000 (14:44 +0200)]
Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/x86/kernel/pci-swiotlb.c
lib/dma-debug.c

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