| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a | [log] [tgz] |
|---|---|---|
| author | Frederic Weisbecker <fweisbec@gmail.com> | Sun Oct 18 01:09:09 2009 +0200 |
| committer | Frederic Weisbecker <fweisbec@gmail.com> | Sun Oct 18 01:12:33 2009 +0200 |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c | |
| parent | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 [diff] | |
| parent | f39cdf25bf77219676ec5360980ac40b1a7e144a [diff] |
Merge commit 'perf/core' into perf/hw-breakpoint Conflicts: kernel/Makefile kernel/trace/Makefile kernel/trace/trace.h samples/Makefile Merge reason: We need to be uptodate with the perf events development branch because we plan to rewrite the breakpoints API on top of perf events.