From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 6 Jul 2012 09:15:35 +0000 (+0200)
Subject: Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... 
X-Git-Tag: v3.5-rc7~7^3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=25c037d64e7a0a8effb562babb2b6218829134ac;p=~emulex%2Finfiniband.git

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

Pull ftrace ring-buffer fixes from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

25c037d64e7a0a8effb562babb2b6218829134ac