From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 9 Mar 2010 16:11:53 +0000 (+0100)
Subject: Merge commit 'v2.6.34-rc1' into perf/urgent
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=548b84166917d6f5e2296123b85ad24aecd3801d;p=mv-sheeva.git

Merge commit 'v2.6.34-rc1' into perf/urgent

Conflicts:
	tools/perf/util/probe-event.c

Merge reason: Pick up -rc1 and resolve the conflict as well.

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

548b84166917d6f5e2296123b85ad24aecd3801d