Merge branch 'perf/urgent' into perf/core
Ingo Molnar [Sat, 21 Nov 2009 12:57:35 +0000 (13:57 +0100)]
Conflicts:
tools/perf/util/symbol.c

Merge reason: this fix will get merged in .33, not .32, plus
              resolve the conflict.

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


Trivial merge