| commit | 9b7e4d601baac83a7104652042107ce94f245524 | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Tue Oct 09 16:51:05 2018 +1100 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Tue Oct 09 16:51:05 2018 +1100 |
| tree | 1ed938abb14fd861b5c28d6df90d7508a1cb5184 | |
| parent | 47fd2060660e62b169990a6fcd9eb61bc1a85c5c [diff] | |
| parent | ac1788cc7da4ce54edcfd2e499afdb0a23d5c41d [diff] |
Merge branch 'fixes' into next Merge our fixes branch. It has a few important fixes that are needed for futher testing and also some commits that will conflict with content in next.