Merge commit 'tip/perfcounters/core' into perf-counters-for-linus

author Peter Zijlstra <[email protected]>

Wed, 22 Jul 2009 16:05:48 +0000 (18:05 +0200)

committer Peter Zijlstra <[email protected]>

Wed, 22 Jul 2009 16:05:48 +0000 (18:05 +0200)
author Peter Zijlstra <[email protected]>
Wed, 22 Jul 2009 16:05:48 +0000 (18:05 +0200)
committer Peter Zijlstra <[email protected]>
Wed, 22 Jul 2009 16:05:48 +0000 (18:05 +0200)
diff --cc kernel/perf_counter.c
Simple merge
diff --cc tools/perf/builtin-report.c
Simple merge
author	Peter Zijlstra <[email protected]>
	Wed, 22 Jul 2009 16:05:48 +0000 (18:05 +0200)
committer	Peter Zijlstra <[email protected]>
	Wed, 22 Jul 2009 16:05:48 +0000 (18:05 +0200)
		1	2
kernel/perf_counter.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/builtin-report.c	patch \|	diff1 \|	diff2 \|	blob \| history