]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branches 'x86/amd', 'x86/vt-d', 'arm/omap', 'arm/smmu', 'arm/renesas', 's390...
authorJoerg Roedel <jroedel@suse.de>
Sun, 1 Nov 2015 15:12:31 +0000 (00:12 +0900)
committerJoerg Roedel <jroedel@suse.de>
Sun, 1 Nov 2015 15:12:31 +0000 (00:12 +0900)
commit593d50b2087e05e57b874a614d870204d2c4c453
tree02b24a3cd6280180b9a73b3688a6ac8f10af3cfd
parent32b88194f71d6ae7768a29f87fbba454728273ee
parent393c092a4d3ace7b8cef633ede2171104dd504d7
parent66ef950d1841487c852d68d00977726f1cd9f053
parent3ca9299e7dc65f2d8242cd7804818a8e840b5a26
parent166bdbd23161160f2abcea70621adba179050bee
parentf4b266d9c41b87f8c25fb3b0b894115b7be08ed3
parent8128f23c436d0dd4f72412e1bf9256e424479dc3
parent1228236de5f978970fb814cc27138cdb00cbb48d
parentcbf3ccd09d683abf1cacd36e3640872ee912d99b
Merge branches 'x86/amd', 'x86/vt-d', 'arm/omap', 'arm/smmu', 'arm/renesas', 's390', 'core' and 'iommu/fixes' into next

Conflicts:
drivers/iommu/amd_iommu_types.h
MAINTAINERS
drivers/iommu/Kconfig
drivers/iommu/Makefile
drivers/iommu/amd_iommu.c
drivers/iommu/amd_iommu_init.c
drivers/iommu/amd_iommu_types.h
drivers/iommu/arm-smmu-v3.c
drivers/iommu/arm-smmu.c
drivers/iommu/intel-iommu.c