diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-26 21:21:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 21:21:59 +0100 |
| commit | 5d0859cef29167d45dc6cf89d19712145e6005d6 (patch) | |
| tree | 1fe3be14cc773f4df5606a9993930cc43889a169 /include/linux/stacktrace.h | |
| parent | tracing: implement trace_clock_*() APIs (diff) | |
| parent | x86: set X86_FEATURE_TSC_RELIABLE (diff) | |
Merge branch 'sched/clock' into tracing/ftrace
Conflicts:
kernel/sched_clock.c
Diffstat (limited to 'include/linux/stacktrace.h')
0 files changed, 0 insertions, 0 deletions