commit | ef8ff74ed8dd9d4b3ba8cb9f2fc927a27c697a8b | [log] [tgz] |
---|---|---|
author | Ingo Molnar <mingo@kernel.org> | Sun Oct 21 19:53:34 2012 +0200 |
committer | Ingo Molnar <mingo@kernel.org> | Sun Oct 21 19:53:34 2012 +0200 |
tree | 0c000fb23d1c40545093a8042b7a98ea11b0e0e0 | |
parent | f38787f4f921222d080d976ef59210ce3c6c6cb4 [diff] | |
parent | 8e49f418c9632790bf456634742d34d97120a784 [diff] |
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>