Merge commit 'v2.6.30-rc5' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Mon, 11 May 2009 12:44:27 +0000 (14:44 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 11 May 2009 12:44:31 +0000 (14:44 +0200)
commit41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51
tree51c50bcb67a5039448ddfa1869d7948cab1217e9
parent19c1a6f5764d787113fa323ffb18be7991208f82
parent091bf7624d1c90cec9e578a18529f615213ff847
Merge commit 'v2.6.30-rc5' into core/iommu

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>
arch/x86/kernel/pci-swiotlb.c
lib/dma-debug.c