tree ae23bfb84d1bf196f7270bc438472d5329aeee92
parent f7a6947cd49b7ff4e03f1b4f7e7b223003d752ca
parent cca19f0b684f4ed6aabf6ad07ae3e15e77bfd78a
author Michael Ellerman <mpe@ellerman.id.au> 1534139946 +1000
committer Michael Ellerman <mpe@ellerman.id.au> 1534139946 +1000

Merge branch 'fixes' into next

Merge our fixes branch from the 4.18 cycle to resolve some minor
conflicts.