Merge branch 'core/iommu' into core/urgent

diff --cc arch/x86/kernel/pci-swiotlb_64.c
Simple merge
diff --cc lib/swiotlb.c
Simple merge
		1	2
arch/x86/kernel/pci-swiotlb_64.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/swiotlb.c	patch \|	diff1 \|	diff2 \|	blob \| history