git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 99cb9ae 263bc3f 1117588 e222d6a 2d565a5 cc4f14a 1c51099 18f2340)

author	Joerg Roedel <jroedel@suse.de>
	Tue, 2 Dec 2014 12:07:13 +0000 (13:07 +0100)
committer	Joerg Roedel <jroedel@suse.de>
	Tue, 2 Dec 2014 12:07:13 +0000 (13:07 +0100)
commit	76771c938e95ce4106c6e8092f4f614d4d1e0ecc
tree	c2fb0f7e70013f745f62fb74899f04c40f052640	tree \| snapshot
parent	99cb9aee770e482ac5ab1fe77213a38df9dd4e77	commit \| diff
parent	263bc3fd6a8e50dc3ef423f36a1ec9cd951a76b8	commit \| diff
parent	11175886daa6b31dfc713b6664215405de9ea1c7	commit \| diff
parent	e222d6a4259c134553acab493b5ab9fc05d70132	commit \| diff
parent	2d565a57f2520b6bc2de0eef1d77d9683f397947	commit \| diff
parent	cc4f14aa170d895c9a43bdb56f62070c8a6da908	commit \| diff
parent	1c51099a427dc8bfee917b2d0e53ad3fafbb930d	commit \| diff
parent	18f23409909a9547ac7c149013286f36fcffa433	commit \| diff

Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next

Conflicts:
drivers/iommu/arm-smmu.c

drivers/iommu/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/iommu/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/iommu/amd_iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/iommu/arm-smmu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/iommu/ipmmu-vmsa.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/iommu/msm_iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/iommu/omap-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
include/linux/iommu.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.