git.openwrt.org Git - openwrt/staging/blogic.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	a20cc76b9efae10c20123049df361adcd7f0e0b3
tree	195502a0d3dfa60ccf0704070e13440be837c068	tree \| snapshot
parent	bb590c9011a7c4e195af486438ead666023f96bd	commit \| diff
parent	a4188beee59763b3507939968677776561adbba5	commit \| diff
parent	1d7f449c898b4180b9db79007f23f599b5bb879e	commit \| diff
parent	cd70d4659ff3ab7e25b29a6f70be5bcfd078db1f	commit \| diff
parent	ae0cbbb1cde1f1bc2454a138a5cab1887d0e103c	commit \| diff
parent	63ce3ae889db917cff0cf0c65c837ca7160c8a83	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