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	aef95917bf78f65a5b39637a07167eacdb402302
tree	195502a0d3dfa60ccf0704070e13440be837c068	tree \| snapshot
parent	109d2bbee2772db2928f0ee91a3ede4736f8d0e4	commit \| diff
parent	811f679bc6efd95dec28883224b70529c519a109	commit \| diff
parent	e9e5158a4beefc104ba7ab1723ca15b0b1bbc50a	commit \| diff
parent	a208cd74bdbb7904d8cc609177fa23cb1b0ee7ca	commit \| diff
parent	e771f09e7c11337095e4e79769687f5f0198fd33	commit \| diff
parent	4b85a9f152054fde8f5668965a60fbbd2b32695e	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