Merge branch 'linus' into x86/iommu
authorIngo Molnar <mingo@elte.hu>
Sun, 14 Sep 2008 12:07:00 +0000 (14:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 14 Sep 2008 12:07:00 +0000 (14:07 +0200)
Conflicts:
lib/swiotlb.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
drivers/pci/intel-iommu.c

Simple merge