Merge branch 'topic/opal-ipmi' into next

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

Wed, 12 Nov 2014 05:33:35 +0000 (16:33 +1100)

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

Wed, 12 Nov 2014 05:33:53 +0000 (16:33 +1100)
author Michael Ellerman <mpe@ellerman.id.au>
Wed, 12 Nov 2014 05:33:35 +0000 (16:33 +1100)
committer Michael Ellerman <mpe@ellerman.id.au>
Wed, 12 Nov 2014 05:33:53 +0000 (16:33 +1100)
diff --cc arch/powerpc/platforms/powernv/opal-wrappers.S
Simple merge
author	Michael Ellerman <mpe@ellerman.id.au>
	Wed, 12 Nov 2014 05:33:35 +0000 (16:33 +1100)
committer	Michael Ellerman <mpe@ellerman.id.au>
	Wed, 12 Nov 2014 05:33:53 +0000 (16:33 +1100)