diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-14 15:15:16 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-14 15:15:16 +0100 |
commit | bf1af3a809506645b9130755b713b008da14737f (patch) | |
tree | 6a13f9c622fa8322a6ca2795bd7bb4e9f8fd6160 /kernel/perf_event.c | |
parent | 0de4b34d466bae571b50f41c7296b85248205e35 (diff) | |
parent | 868baf07b1a259f5f3803c1dc2777b6c358f83cf (diff) |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/perf_event.c')
0 files changed, 0 insertions, 0 deletions