From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 27 Apr 2011 08:38:30 +0000 (+0200)
Subject: Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: MMI-PSA29.97-13-9~19718^2~18
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=32673822e440eb92eb334631eb0a199d0c532d13;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'tip/perf/core' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core

Conflicts:
	include/linux/perf_event.h

Merge reason: pick up the latest jump-label enhancements, they are cooked ready.

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

32673822e440eb92eb334631eb0a199d0c532d13