diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-22 13:10:02 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-22 13:10:02 -0400 |
| commit | a524446fe82f7f38738403a5a080c4910af86a61 (patch) | |
| tree | d15127a183d1c2f864136389e5a758ed80a29449 | |
| parent | 0cf53ff62b3e9e491ff5e5f05b193fb6ce643047 (diff) | |
| parent | 09c9e84d474d917d9de5b9011ed2064b03a19677 (diff) | |
| parent | 505f2b970b2269ce4cb669b3ff4f6479d379cec2 (diff) | |
Merge branches 'tracing/ftrace', 'tracing/hw-breakpoints', 'tracing/ring-buffer', 'tracing/textedit' and 'linus' into tracing/core