git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fe82dce f171aba a6fda0f dedd943 80f7b3d c50e324 5fc24d8)

author	Joerg Roedel <jroedel@suse.de>
	Thu, 2 Oct 2014 10:24:45 +0000 (12:24 +0200)
committer	Joerg Roedel <jroedel@suse.de>
	Thu, 2 Oct 2014 10:24:45 +0000 (12:24 +0200)
commit	09b5269a1b3d47525d7c25efeb16f5407ef82ea2
tree	8a505c93aed6058c3495f01bf295cf5a0e9c606d	tree \| snapshot
parent	fe82dcec644244676d55a1384c958d5f67979adb	commit \| diff
parent	f171abab8f1a75797124be5aae8376e20e4852d9	commit \| diff
parent	a6fda0f586bb2c39e763a2ae5561e1f6ade8c3a8	commit \| diff
parent	dedd9431484a826f85667967ef0c5954b12c3537	commit \| diff
parent	80f7b3d1b1f4ec6c80fa3b40c7c9a419e28b0897	commit \| diff
parent	c50e3247aa2d825e0dc0f4b876ee22d7134d24ca	commit \| diff
parent	5fc24d8cb9d43e0db335137051092da03a6845dc	commit \| diff

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	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/iommu/arm-smmu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/iommu/dmar.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/iommu/intel_irq_remapping.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
drivers/iommu/omap-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history

Linux kernel for KaRo TX COM modules