Joerg Roedel 00fb5430f5 Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next ...

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c

2012-01-09 13:04:05 +01:00

..

kvm

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

2012-01-09 13:04:05 +01:00