diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-03-04 05:51:29 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-03-04 05:51:29 -0500 |
commit | e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 (patch) | |
tree | 61b64506b2c016e050f940a89d1ffd36b7c00fdf /kernel/trace/trace_output.c | |
parent | ae1f30384baef4056438d81b305a6a5199b0d16c (diff) | |
parent | ac91d85456372a90af5b85eb6620fd2efb1e431b (diff) |
Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'kernel/trace/trace_output.c')
0 files changed, 0 insertions, 0 deletions