Merge branch 'next-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerp...
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 26 Mar 2015 09:03:16 +0000 (20:03 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 26 Mar 2015 09:04:28 +0000 (20:04 +1100)
commitdf60f57684529a1dde4461cf84354453b440806a
tree618f030f673980a4c9d6bf27c1db50459a3b99d1
parent605f30205348f1d808d98d77505149da8b047b9f
parentb921e90260cec1e04988bb3763491de885b67b51
Merge branch 'next-misc' of git://git./linux/kernel/git/benh/powerpc into test

Merge miscellaneous bits from benh. Fix a minor conflict with
OpalMessageType changing names to opal_msg_type.
arch/powerpc/include/asm/opal.h
arch/powerpc/platforms/powernv/opal.c