git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Joerg Roedel <jroedel@suse.de>
	Thu, 2 Apr 2015 11:33:19 +0000 (13:33 +0200)
committer	Joerg Roedel <jroedel@suse.de>
	Thu, 2 Apr 2015 11:33:19 +0000 (13:33 +0200)
commit	7f65ef01e131650d455875598099cd06fea6096b
tree	4f1d954664a7d05dd6cfbf1e4af6250bf1dc8f48	tree \| snapshot (tar.gz zip)
parent	509fca899d5682a6eee3d1fb70bba7c89439034b	commit \| diff
parent	2f119c7895af56ca26b8e94f4650145a4b1b0d12	commit \| diff
parent	d4b036648402bb4ef6d4a0df51375a2fb705b6cc	commit \| diff
parent	b61e2e62aa2dee89d6e71aa90a9341607c4a7a97	commit \| diff
parent	804cb54cbb3ddac58218e830d64816617bdb6da8	commit \| diff
parent	89be34a1ced886880a3219f9d2ba2192dc738ef2	commit \| diff

Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/tegra' and 'core' into next

Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/tegra-gart.c
drivers/iommu/tegra-smmu.c

drivers/iommu/amd_iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/amd_iommu_types.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/arm-smmu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/ipmmu-vmsa.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/tegra-gart.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/tegra-smmu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history