Skip to content
Commit 00fb5430 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c
parents 805a6af8 1a36ea81 1456e9d2
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment