Merge commit 'tip/perfcounters/core' into perf-counters-for-linus
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Wed, 22 Jul 2009 16:05:48 +0000 (18:05 +0200)
committerPeter Zijlstra <a.p.zijlstra@chello.nl>
Wed, 22 Jul 2009 16:05:48 +0000 (18:05 +0200)
1  2 
kernel/perf_counter.c
tools/perf/builtin-report.c

Simple merge
Simple merge