From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 9 Jan 2012 12:06:28 +0000 (+0100)
Subject: Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
X-Git-Tag: v3.3-rc1~120^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f93ea733878733f3e98475bc3e2ccf789bebcfb8;p=pandora-kernel.git

Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/intel-iommu.c
	include/linux/iommu.h
---

f93ea733878733f3e98475bc3e2ccf789bebcfb8
Reading git-diff-tree failed