diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-10 04:56:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-10 04:56:25 -0400 |
| commit | 12e87e36e0141c08dbc8b2177c93c75fb18ad7e5 (patch) | |
| tree | a82ac66b372ddc7ee97fe095222232875b6737d4 /kernel | |
| parent | 42b40b3d55f5782b00b74d9105c3565fbfa5cb80 (diff) | |
| parent | c3ffc7a40b7e94b094efe1c8ab4e24370a782b65 (diff) | |
| parent | 7bffc23e56e92c14b787bf4d95249a32085bfed5 (diff) | |
| parent | 7a203f3b089be4410fe065dd9927027eade94557 (diff) | |
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' into tracing/core