]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf1abb80cb5ab945572ba522b0527cc2214b35857
tree618f030f673980a4c9d6bf27c1db50459a3b99d1
parent680423c6fe227b1e8f80ca70c021229a39730929
parentaa12e8bb2844a7db52a9bb0f6cd5c6ac794d3459
Merge branch 'next-misc' of git://git.kernel.org/pub/scm/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