Merge commit 'v2.6.34-rc2' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 22 Mar 2010 17:46:57 +0000 (18:46 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 22 Mar 2010 17:47:01 +0000 (18:47 +0100)
Merge reason: Pick up latest perf fixes from upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
MAINTAINERS
arch/x86/Kconfig
tools/perf/perf.c
tools/perf/util/hist.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge