git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 605f302 b921e90)
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)
Merge miscellaneous bits from benh. Fix a minor conflict with
OpalMessageType changing names to opal_msg_type.


Trivial merge
Pandora Kernel Repository