diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /include/linux/timerqueue.h | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'include/linux/timerqueue.h')
| -rw-r--r-- | include/linux/timerqueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h index d24aabaca474..a520fd70a59f 100644 --- a/include/linux/timerqueue.h +++ b/include/linux/timerqueue.h | |||
| @@ -24,7 +24,7 @@ extern struct timerqueue_node *timerqueue_iterate_next( | |||
| 24 | struct timerqueue_node *node); | 24 | struct timerqueue_node *node); |
| 25 | 25 | ||
| 26 | /** | 26 | /** |
| 27 | * timerqueue_getnext - Returns the timer with the earlies expiration time | 27 | * timerqueue_getnext - Returns the timer with the earliest expiration time |
| 28 | * | 28 | * |
| 29 | * @head: head of timerqueue | 29 | * @head: head of timerqueue |
| 30 | * | 30 | * |