Merge remote-tracking branch 'iommu/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 5 Nov 2015 02:06:06 +0000 (13:06 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 5 Nov 2015 02:06:06 +0000 (13:06 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:06:06 +0000 (13:06 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 02:06:06 +0000 (13:06 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm64/Kconfig
Simple merge
diff --cc arch/s390/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 5 Nov 2015 02:06:06 +0000 (13:06 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 5 Nov 2015 02:06:06 +0000 (13:06 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history