tree f2c543e9c9ce4b1400081de08bcaf6fd55b72972
parent 805a6af8dba5dfdd35ec35dc52ec0122400b2610
parent 1a36ea815a3557c03819ec7c90a6b2fb128385ca
parent 1456e9d2c4667a6e9221eda27b9648fb3bcc1e8e
author Joerg Roedel <joerg.roedel@amd.com> 1326110645 +0100
committer Joerg Roedel <joerg.roedel@amd.com> 1326110645 +0100

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

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c