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-Tag: v2.6.34-rc2~54^2~1
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=548b84166917d6f5e2296123b85ad24aecd3801d

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