Merge branch 'perf/urgent' into perf/core · git-mirror/linux@7031281 · GitHub

Commit

Merge branch 'perf/urgent' into perf/core

Browse files

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>

Loading branch information

Ingo Molnar committed Nov 21, 2009

2 parents ba77c9e + d62d77f commit 7031281