Merge branch 'linus' into core/iommu
authorIngo Molnar <mingo@elte.hu>
Sat, 10 Jan 2009 23:51:06 +0000 (00:51 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 10 Jan 2009 23:51:06 +0000 (00:51 +0100)
1  2 
arch/ia64/kernel/pci-dma.c
arch/x86/kernel/pci-dma.c
lib/swiotlb.c

Simple merge
Simple merge
diff --cc lib/swiotlb.c
Simple merge