diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-27 09:06:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-27 09:06:11 +0100 |
| commit | da74ff0f9b31ed97104c22c278bf2b41bcf8f33c (patch) | |
| tree | aaaff8ca13625da1823204e1fee29774117f7bc7 /include/linux | |
| parent | Merge branches 'tracing/ftrace' and 'linus' into tracing/core (diff) | |
| parent | tracing: use newline separator for trace options list (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Conflicts:
kernel/sched_clock.c
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions