Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 5 Oct 2010 07:47:14 +0000 (09:47 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 5 Oct 2010 07:47:14 +0000 (09:47 +0200)
Conflicts:
tools/perf/util/ui/browsers/hists.c

Merge reason: fix the conflict and merge in changes for dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge