From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 10 Oct 2008 17:47:12 +0000 (+0200)
Subject: Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus... 
X-Git-Tag: v2.6.28-rc1~712^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=725c25819e4a0dafdcf42a5f31bc569341919c7c;p=pandora-kernel.git

Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus-phase3-B

Conflicts:
	arch/x86/kernel/pci-gart_64.c
	include/asm-x86/dma-mapping.h
---

725c25819e4a0dafdcf42a5f31bc569341919c7c
Reading git-diff-tree failed