commit | a54c61f46e25345e99eec06a402f746fe33febc6 | [log] [tgz] |
---|---|---|
author | Michael Ellerman <mpe@ellerman.id.au> | Fri Nov 10 20:55:03 2017 +1100 |
committer | Michael Ellerman <mpe@ellerman.id.au> | Fri Nov 10 20:55:03 2017 +1100 |
tree | 23f59fe8702aaf90802cef6f25e76c15211747e1 | |
parent | 77fad8bfb1d2f8225b05e4ea34457875fcfae37e [diff] | |
parent | 7ecb37f62fe58e3e4d9b03443b92d213b2c108ce [diff] |
Merge branch 'fixes' into next We have some dependencies & conflicts between patches in fixes and things to go in next, both in the radix TLB flush code and the IMC PMU driver. So merge fixes into next.