From: Ingo Molnar 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: v3.0-rc1~404^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32673822e440eb92eb334631eb0a199d0c532d13;p=profile%2Fivi%2Fkernel-x86-ivi.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 --- 32673822e440eb92eb334631eb0a199d0c532d13