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)
commit6e03f99803195e5aaf7f247db31b0d11857ccc35
treeffd4b1a140854977e984a4390105333845c0e90c
parent982162602b31041b426edec6480d327743abcbcc
parent6bfb09a1005193be5c81ebac9f3ef85210142650
Merge branch 'linus' into x86/iommu

Conflicts:
lib/swiotlb.c

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