diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-22 13:02:09 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-22 13:02:09 +1000 |
| commit | 5bd3ef84d73c2ea7b4babbad060909753c4828d4 (patch) | |
| tree | fdf2bafb48ae1ed03175f6c77a7548a181e69ee9 /block/blk-settings.c | |
| parent | 0658c16056660886ea2f35c4f038be70a94b1532 (diff) | |
| parent | 6d25b688ecc488753af3c9e6f6a9a575b863cf37 (diff) | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
Diffstat (limited to 'block/blk-settings.c')
| -rw-r--r-- | block/blk-settings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index 59fd05d9f1d..69c42adde52 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -431,7 +431,7 @@ EXPORT_SYMBOL(blk_queue_segment_boundary); * * description: * set required memory and length alignment for direct dma transactions. - * this is used when buiding direct io requests for the queue. + * this is used when building direct io requests for the queue. * **/ void blk_queue_dma_alignment(struct request_queue *q, int mask) |