Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@kernel.org>
Sun, 21 Oct 2012 17:53:34 +0000 (19:53 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 21 Oct 2012 17:53:34 +0000 (19:53 +0200)
Pull ftrace ring-buffer resizing fix from Steve Rostedt.

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

Trivial merge