diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
| commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
| tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /Documentation/timers/00-INDEX | |
| parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'Documentation/timers/00-INDEX')
| -rw-r--r-- | Documentation/timers/00-INDEX | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/timers/00-INDEX b/Documentation/timers/00-INDEX index 397dc35e1323..a9248da5cdbc 100644 --- a/Documentation/timers/00-INDEX +++ b/Documentation/timers/00-INDEX | |||
| @@ -4,6 +4,8 @@ highres.txt | |||
| 4 | - High resolution timers and dynamic ticks design notes | 4 | - High resolution timers and dynamic ticks design notes |
| 5 | hpet.txt | 5 | hpet.txt |
| 6 | - High Precision Event Timer Driver for Linux | 6 | - High Precision Event Timer Driver for Linux |
| 7 | hpet_example.c | ||
| 8 | - sample hpet timer test program | ||
| 7 | hrtimers.txt | 9 | hrtimers.txt |
| 8 | - subsystem for high-resolution kernel timers | 10 | - subsystem for high-resolution kernel timers |
| 9 | timer_stats.txt | 11 | timer_stats.txt |