diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 09:13:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 09:13:26 +0200 |
| commit | 84b13fd596522db47f9545d5124c30cc00dfdf5a (patch) | |
| tree | c1f51b8fe43a59fb56ea43a18da88c0d0812dd7d /kernel/perf_event.c | |
| parent | f92128193094c288bc315db1694fafeaeb7ee1d0 (diff) | |
| parent | a0cccc2e8e9fb16cbed3a117b30e3fbac3092ee3 (diff) | |
Merge branch 'perf/live' into perf/core
Conflicts:
tools/perf/builtin-record.c
Merge reason: add the live tracing feature, resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions