Merge branch 'core/iommu' into core/urgent
Ingo Molnar [Mon, 5 Jan 2009 13:17:24 +0000 (14:17 +0100)]
Conflicts:
lib/swiotlb.c

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

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