From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 25 Apr 2012 10:33:24 +0000 (+0200)
Subject: Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.4-rc5~18^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c716ef56f1319e8a515cb1947a3ec59b06e94a5e;p=linux.git

Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
---

c716ef56f1319e8a515cb1947a3ec59b06e94a5e