diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /block/blk-core.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 725091d5496d..90f22cc30799 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -1184,7 +1184,7 @@ static bool bio_attempt_front_merge(struct request_queue *q, | |||
1184 | 1184 | ||
1185 | /* | 1185 | /* |
1186 | * Attempts to merge with the plugged list in the current process. Returns | 1186 | * Attempts to merge with the plugged list in the current process. Returns |
1187 | * true if merge was succesful, otherwise false. | 1187 | * true if merge was successful, otherwise false. |
1188 | */ | 1188 | */ |
1189 | static bool attempt_plug_merge(struct task_struct *tsk, struct request_queue *q, | 1189 | static bool attempt_plug_merge(struct task_struct *tsk, struct request_queue *q, |
1190 | struct bio *bio) | 1190 | struct bio *bio) |