diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-03 16:02:16 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-03 16:02:16 +0100 |
| commit | 3612fdf780e28b10323dd12d2b0f306c7ada4d4c (patch) | |
| tree | 6749928731df6d9fd5da502d6c16dc656b64850e /init | |
| parent | 654952bcb999ad96e1d9ae9145fe5c0522ec297a (diff) | |
| parent | 633ddaa7f471e9db181f993c1458d6f4bae321ca (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions