diff options
| author | Ingo Molnar <[email protected]> | 2009-10-13 07:31:28 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2009-10-13 07:31:34 +0000 |
| commit | 9dbdd6c41c12fb42ee7188eafa7e1917b192af3a (patch) | |
| tree | 06a9eb894bc976c5c20e84ccd74fd82b9b71aed4 /tools/perf/builtin-annotate.c | |
| parent | perf_events, x86: Fix event constraints code (diff) | |
| parent | Linux 2.6.32-rc4 (diff) | |
| download | kernel-9dbdd6c41c12fb42ee7188eafa7e1917b192af3a.tar.gz kernel-9dbdd6c41c12fb42ee7188eafa7e1917b192af3a.zip | |
Merge commit 'v2.6.32-rc4' into perf/core
Merge reason: we were on an -rc1 base, merge up to -rc4.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/builtin-annotate.c')
0 files changed, 0 insertions, 0 deletions