| commit | 9fc849144c80091252551a4897782ed5321d654a | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Tue Apr 25 00:24:04 2017 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Tue Apr 25 00:24:04 2017 +1000 |
| tree | 0af5b9f46ee5a79a6abe64ee63eea12f2a99fdbb | |
| parent | 9a914aa6824ac5d5fd3195ed422f31540a0ab767 [diff] | |
| parent | 24bd909e94776ecce95291bff910f14c78ac4a43 [diff] |
Merge branch 'topic/kprobes' into next Although most of these kprobes patches are powerpc specific, there's a couple that touch generic code (with Acks). At the moment there's one conflict with acme's tree, but it's not too bad. Still just in case some other conflicts show up, we've put these in a topic branch so another tree could merge some or all of it if necessary.