| commit | 5d0859cef29167d45dc6cf89d19712145e6005d6 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Feb 26 21:21:59 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Feb 26 21:21:59 2009 +0100 |
| tree | 1fe3be14cc773f4df5606a9993930cc43889a169 | |
| parent | 14131f2f98ac350ee9e73faed916d2238a8b6a0d [diff] | |
| parent | 83ce400928680a6c8123d492684b27857f5a2d95 [diff] |
Merge branch 'sched/clock' into tracing/ftrace Conflicts: kernel/sched_clock.c