| commit | da74ff0f9b31ed97104c22c278bf2b41bcf8f33c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Feb 27 09:06:11 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Feb 27 09:06:11 2009 +0100 |
| tree | aaaff8ca13625da1823204e1fee29774117f7bc7 | |
| parent | f701d354075914296474d062f18fc8ee681a2318 [diff] | |
| parent | 5c6a3ae1b4beebb56e2916b84f1208d96a9e32ff [diff] |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace Conflicts: kernel/sched_clock.c