]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'core/iommu' into core/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 5 Jan 2009 13:17:24 +0000 (14:17 +0100)
committerIngo Molnar <mingo@elte.hu>
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