git.baikalelectronics.ru Git - kernel.git/commit

author	Joerg Roedel <jroedel@suse.de>
	Wed, 4 Feb 2015 15:53:44 +0000 (16:53 +0100)
committer	Joerg Roedel <jroedel@suse.de>
	Wed, 4 Feb 2015 15:53:44 +0000 (16:53 +0100)
commit	661718f975de8251f3f257190493eca2aac8dd39
tree	195502a0d3dfa60ccf0704070e13440be837c068	tree \| snapshot
parent	4f1c8c37e48c1560830e01caf0744a340f8fa94c	commit \| diff
parent	de24c5e5fd031bad55e9847048cbac33eaf7612f	commit \| diff
parent	8ea94df5726a519dde245f093d4ff31240d82da2	commit \| diff
parent	c1073bc257cc5c1a02ff78feca3db79e481de638	commit \| diff
parent	07bfdd500862503f889a32ffad1193ba20a14e6c	commit \| diff
parent	9f13b907677bdeb05a97e7e04c0e9efc13c5732b	commit \| diff

Merge branches 'arm/renesas', 'arm/smmu', 'arm/omap', 'ppc/pamu', 'x86/amd' and 'core' into next

Conflicts:
drivers/iommu/Kconfig
drivers/iommu/Makefile

MAINTAINERS	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/amd_iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/amd_iommu_v2.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history