Merge branch 'core/iommu' into core/urgent
commit46483d10e5123d78cf9abf37577aa8e75f18b8a4
authorIngo Molnar <mingo@elte.hu>
Mon, 5 Jan 2009 13:17:24 +0000 (5 14:17 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 5 Jan 2009 13:17:24 +0000 (5 14:17 +0100)
treeffb646db8023433588ce87797a9428c90ec118bc
parentc59ab97e9ecdee9084d2da09e5a8ceea9a396508
parent874d6a9555516cbac828131d573ce3d16ce47164
Merge branch 'core/iommu' into core/urgent

Conflicts:
lib/swiotlb.c
arch/x86/kernel/pci-swiotlb_64.c
lib/swiotlb.c