diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
| commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
| tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /include/linux | |
| parent | dbc1651f0c5b7d13acc59d3b805a7224332fb1fb (diff) | |
| parent | b3c29d85bf0dcce9e99cbfba2811aeefae017aaa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/elevator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/elevator.h b/include/linux/elevator.h index 4a6f50e31c73..23fe746a1d51 100644 --- a/include/linux/elevator.h +++ b/include/linux/elevator.h | |||
| @@ -66,7 +66,7 @@ struct elevator_type | |||
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | /* | 68 | /* |
| 69 | * each queue has an elevator_queue assoicated with it | 69 | * each queue has an elevator_queue associated with it |
| 70 | */ | 70 | */ |
| 71 | struct elevator_queue | 71 | struct elevator_queue |
| 72 | { | 72 | { |