From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 23 Jul 2012 10:17:00 +0000 (+0200)
Subject: Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr... 
X-Git-Tag: v3.6-rc1~111^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=395e51f18d3b26619c1c462b7a1c0226846ac0a9;p=pandora-kernel.git

Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next

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

395e51f18d3b26619c1c462b7a1c0226846ac0a9
Reading git-diff-tree failed