-
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpcMichael Ellerman authored
Merge miscellaneous bits from benh. Fix a minor conflict with OpalMessageType changing names to opal_msg_type.
df60f576
Merge miscellaneous bits from benh. Fix a minor conflict with OpalMessageType changing names to opal_msg_type.