Commits
Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next Conflicts: drivers/pci/hotplug/acpiphp_glue.c
Showing diff to1a36ea815a3
Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next Conflicts: drivers/pci/hotplug/acpiphp_glue.c