diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-22 18:10:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-22 18:10:02 +0100 |
| commit | a524446fe82f7f38738403a5a080c4910af86a61 (patch) | |
| tree | d15127a183d1c2f864136389e5a758ed80a29449 /include/linux | |
| parent | tracing: keep the tracing buffer after self-test failure (diff) | |
| parent | tracing/ring-buffer: don't annotate rb_cpu_notify with __cpuinit (diff) | |
| parent | tracing, Text Edit Lock - kprobes architecture independent support, nommu fix (diff) | |
Merge branches 'tracing/ftrace', 'tracing/hw-breakpoints', 'tracing/ring-buffer', 'tracing/textedit' and 'linus' into tracing/core