tree e203b2b499c76c2e35563cefd8b03146bf1cf73c
parent 6a13feb9c82803e2b815eca72fa7a9f5561d7861
parent b61e5e80e3cd37f0183cdc04b03861a0467d9f52
parent 3ca9299e7dc65f2d8242cd7804818a8e840b5a26
parent 166bdbd23161160f2abcea70621adba179050bee
parent 8128f23c436d0dd4f72412e1bf9256e424479dc3
parent 1228236de5f978970fb814cc27138cdb00cbb48d
parent 393c092a4d3ace7b8cef633ede2171104dd504d7
author Joerg Roedel <jroedel@suse.de> 1446462214 +0900
committer Joerg Roedel <jroedel@suse.de> 1446462214 +0900

Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next

Conflicts:
	drivers/iommu/amd_iommu_types.h