commit | 218ea31039e84901b449c3769035456688f6e17d | [log] [tgz] |
---|---|---|
author | Michael Ellerman <mpe@ellerman.id.au> | Mon Jul 03 23:05:43 2017 +1000 |
committer | Michael Ellerman <mpe@ellerman.id.au> | Mon Jul 03 23:05:43 2017 +1000 |
tree | 340773129b6a056c07b3ffe6d60326e0e89ef73c | |
parent | 5405c92bc2cd0c09c7f9716af234b45ef66faa94 [diff] | |
parent | d6bd8194e2867e85ac2de63486d3b83ccfae4e62 [diff] |
Merge branch 'fixes' into next Merge our fixes branch, a few of them are tripping people up while working on top of next, and we also have a dependency between the CXL fixes and new CXL code we want to merge into next.