diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-07-06 11:15:35 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-07-10 10:27:06 +0200 |
commit | 25c037d64e7a0a8effb562babb2b6218829134ac (patch) | |
tree | 61b4fe2affd882007856f5dd4ac5b8bbb29798dc /kernel/time/tick-sched.c | |
parent | 7ed97ad41ffa94040dfd593948962a7e9e7b0db9 (diff) | |
parent | 48fdc72f23ad9a9956e524a47843135d0bbc3317 (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 fixes from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time/tick-sched.c')
0 files changed, 0 insertions, 0 deletions