| commit | df60f57684529a1dde4461cf84354453b440806a | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Thu Mar 26 20:03:16 2015 +1100 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Thu Mar 26 20:04:28 2015 +1100 |
| tree | 618f030f673980a4c9d6bf27c1db50459a3b99d1 | |
| parent | 605f30205348f1d808d98d77505149da8b047b9f [diff] | |
| parent | b921e90260cec1e04988bb3763491de885b67b51 [diff] |
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.