Merge remote-tracking branch 'samsung-krzk/for-next'

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

Tue, 9 Feb 2016 23:15:26 +0000 (10:15 +1100)

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

Tue, 9 Feb 2016 23:15:26 +0000 (10:15 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Feb 2016 23:15:26 +0000 (10:15 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Feb 2016 23:15:26 +0000 (10:15 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 9 Feb 2016 23:15:26 +0000 (10:15 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 9 Feb 2016 23:15:26 +0000 (10:15 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/configs/multi_v7_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history