From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 11 May 2010 15:40:57 +0000 (+0200)
Subject: Merge branch 'iommu/largepages' into amd-iommu/2.6.35
X-Git-Tag: v2.6.35-rc1~526^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=795e74f7a69f9c08afa4fa7c86cc4f18a62bd630;p=pandora-kernel.git

Merge branch 'iommu/largepages' into amd-iommu/2.6.35

Conflicts:
	arch/x86/kernel/amd_iommu.c
---

795e74f7a69f9c08afa4fa7c86cc4f18a62bd630
Reading git-diff-tree failed