Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next
authorJoerg Roedel <joerg.roedel@amd.com>
Mon, 9 Jan 2012 12:04:05 +0000 (13:04 +0100)
committerJoerg Roedel <joerg.roedel@amd.com>
Mon, 9 Jan 2012 12:04:05 +0000 (13:04 +0100)
commit00fb5430f547e411ab03385cfa548776aaac1c92
treef2c543e9c9ce4b1400081de08bcaf6fd55b72972
parent805a6af8dba5dfdd35ec35dc52ec0122400b2610
parent1a36ea815a3557c03819ec7c90a6b2fb128385ca
parent1456e9d2c4667a6e9221eda27b9648fb3bcc1e8e
Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next

Conflicts:
drivers/pci/hotplug/acpiphp_glue.c
drivers/iommu/intel-iommu.c
drivers/iommu/iommu.c
drivers/iommu/omap-iommu.c
drivers/iommu/omap-iovmm.c
drivers/media/video/omap3isp/ispccdc.c
drivers/media/video/omap3isp/ispstat.c
drivers/media/video/omap3isp/ispvideo.c
drivers/pci/ats.c