| commit | 10b0256496fd6c162478547f7c6df1e052e87644 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Thu Jun 05 11:18:34 2014 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Thu Jun 05 12:26:50 2014 +0200 |
| tree | 7037905737ae83a86a5cdb376cd1d66f7f407e2e | |
| parent | c56d34064b6eb9f9cde9e35bbfe16eedf3d81f94 [diff] | |
| parent | 69902c718c0b476e94ed7fccd3cf29ca39fe433a [diff] |
Merge branch 'perf/kprobes' into perf/core Conflicts: arch/x86/kernel/traps.c The kprobes enhancements are fully cooked, ship them upstream. Signed-off-by: Ingo Molnar <mingo@kernel.org>