]> 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)
commitb4722db9b5422bf5b5b3a45b9bafdeaa279146ed
tree0c000fb23d1c40545093a8042b7a98ea11b0e0e0
parentd7691f925786692b5b47675b93fbdc9535150037
parentc5d5939ee71975d81ad601e92f2ed314789f727b
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>