Merge remote-tracking branch 'powerpc/next'

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

Wed, 4 Nov 2015 23:37:52 +0000 (10:37 +1100)

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

Wed, 4 Nov 2015 23:37:52 +0000 (10:37 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:37:52 +0000 (10:37 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Nov 2015 23:37:52 +0000 (10:37 +1100)
diff --cc arch/powerpc/sysdev/mpic.c
Simple merge
diff --cc drivers/clk/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 4 Nov 2015 23:37:52 +0000 (10:37 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 4 Nov 2015 23:37:52 +0000 (10:37 +1100)
		1	2
arch/powerpc/sysdev/mpic.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clk/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history