| commit | b3124ec2f9970c7374d34b00843d9791fca66afc | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Mon Aug 13 15:59:06 2018 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Mon Aug 13 15:59:06 2018 +1000 |
| tree | ae23bfb84d1bf196f7270bc438472d5329aeee92 | |
| parent | f7a6947cd49b7ff4e03f1b4f7e7b223003d752ca [diff] | |
| parent | cca19f0b684f4ed6aabf6ad07ae3e15e77bfd78a [diff] |
Merge branch 'fixes' into next Merge our fixes branch from the 4.18 cycle to resolve some minor conflicts.