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)
commitef8ff74ed8dd9d4b3ba8cb9f2fc927a27c697a8b
tree0c000fb23d1c40545093a8042b7a98ea11b0e0e0
parentf38787f4f921222d080d976ef59210ce3c6c6cb4
parent8e49f418c9632790bf456634742d34d97120a784
Merge branch 'tip/perf/urgent' of git://git./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>