Merge branch 'next-dlpar' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/power...

author Michael Ellerman <mpe@ellerman.id.au>

Mon, 13 Apr 2015 05:29:36 +0000 (15:29 +1000)

committer Michael Ellerman <mpe@ellerman.id.au>

Mon, 13 Apr 2015 05:30:21 +0000 (15:30 +1000)
author Michael Ellerman <mpe@ellerman.id.au>
Mon, 13 Apr 2015 05:29:36 +0000 (15:29 +1000)
committer Michael Ellerman <mpe@ellerman.id.au>
Mon, 13 Apr 2015 05:30:21 +0000 (15:30 +1000)
diff --cc arch/powerpc/include/asm/rtas.h
Simple merge
diff --cc arch/powerpc/platforms/pseries/pseries.h
Simple merge
author	Michael Ellerman <mpe@ellerman.id.au>
	Mon, 13 Apr 2015 05:29:36 +0000 (15:29 +1000)
committer	Michael Ellerman <mpe@ellerman.id.au>
	Mon, 13 Apr 2015 05:30:21 +0000 (15:30 +1000)
		1	2
arch/powerpc/include/asm/rtas.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/platforms/pseries/pseries.h	patch \|	diff1 \|	diff2 \|	blob \| history