From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 14 Dec 2011 11:41:31 +0000 (+0100)
Subject: Merge branch 'iommu/page-sizes' into x86/amd
X-Git-Tag: v3.3-rc1~120^2~1^3~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a06ec394c9318e2ee9209ca3c106d3fa6fbfeb00;p=pandora-kernel.git

Merge branch 'iommu/page-sizes' into x86/amd

Conflicts:
	drivers/iommu/amd_iommu.c
---

a06ec394c9318e2ee9209ca3c106d3fa6fbfeb00
Reading git-diff-tree failed