]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core...
authorJoerg Roedel <jroedel@suse.de>
Thu, 2 Oct 2014 10:24:45 +0000 (12:24 +0200)
committerJoerg Roedel <jroedel@suse.de>
Thu, 2 Oct 2014 10:24:45 +0000 (12:24 +0200)
commitbc630b00683eb8aa855cd33ff7c3da9e96b3fa57
tree8a505c93aed6058c3495f01bf295cf5a0e9c606d
parent6db42dbacd438e9b3f81bce794b95c097019e378
parente4cd06cf9792f635353cf94fb238556e344278af
parent167289c39730fda434827a257dfc502debeb3dcb
parenta56f864877e854e22ddeb3b04fa46f6e1436e3cf
parent1c764d61e6f0da1c35488c6cbaa37b100b8dd375
parente57b5fcc3b7062d8fd09b78224e427f7d2863b30
parent2bc900af0519ecacb88976ac36e5e4a0999ef2ca
Merge branches 'arm/exynos', 'arm/omap', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

Conflicts:
drivers/iommu/arm-smmu.c
drivers/iommu/amd_iommu.c
drivers/iommu/arm-smmu.c
drivers/iommu/dmar.c
drivers/iommu/intel-iommu.c
drivers/iommu/intel_irq_remapping.c
drivers/iommu/omap-iommu.c