diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 21:21:59 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-27 08:35:19 +0100 |
| commit | 1b49061d400c9e51e3ac2aac026a099fe599b9bb (patch) | |
| tree | 54c632cd7f0be2573897c1463a247e69fb769940 /block/genhd.c | |
| parent | tracing: implement trace_clock_*() APIs (diff) | |
| parent | x86: set X86_FEATURE_TSC_RELIABLE (diff) | |
| download | linux-1b49061d400c9e51e3ac2aac026a099fe599b9bb.tar.xz linux-1b49061d400c9e51e3ac2aac026a099fe599b9bb.zip | |
Merge branch 'sched/clock' into tracing/ftrace
Conflicts:
kernel/sched_clock.c
Diffstat (limited to 'block/genhd.c')
0 files changed, 0 insertions, 0 deletions