tree 54dae585a10100f977c525399b7598855b3ca7df
parent ba77c9e11111a172c9e8687fe16a6a173a61916f
parent d62d77fd18cc82e839e49b7ef3360e4411f7d2e5
author Ingo Molnar <mingo@elte.hu> 1258808255 +0100
committer Ingo Molnar <mingo@elte.hu> 1258808255 +0100

Merge branch 'perf/urgent' into perf/core

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>