]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf6b65aa00753118335afe09b1ea6c2e66a6cec60
tree0c000fb23d1c40545093a8042b7a98ea11b0e0e0
parentc6fb7cd2cd61dcc3ef6abdd1c55d0491c677ee38
parent81011e1e40c21903cf4b94cc51258e590fca05e9
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>