From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 21 Oct 2012 17:53:34 +0000 (+0200)
Subject: Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste... 
X-Git-Tag: next-20121022~26^2^2
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=ef8ff74ed8dd9d4b3ba8cb9f2fc927a27c697a8b;p=karo-tx-linux.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 resizing fix from Steve Rostedt.

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

ef8ff74ed8dd9d4b3ba8cb9f2fc927a27c697a8b