From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 9 Jan 2012 12:04:05 +0000 (+0100)
Subject: Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next
X-Git-Tag: stable/for-linus-3.4-tag~34^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=00fb5430f547e411ab03385cfa548776aaac1c92;p=users%2Fdwmw2%2Flinux.git

Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c
---

00fb5430f547e411ab03385cfa548776aaac1c92