From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 21 Nov 2009 12:57:35 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: v2.6.33-rc1~399^2~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7031281e02bf951a2259849217193fb9d75a9762;p=thirdparty%2Fkernel%2Flinux.git

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>
---

7031281e02bf951a2259849217193fb9d75a9762