Merge branch 'master' into export-slabh

[karo-tx-linux.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index bc3212e0cef9b694f1186e2db31cd3f27bfb8f2a..c9c266db0624d73efaa487f664006d1bb862151b 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2893,7 +2893,7 @@ int block_write_full_page_endio(struct page *page, get_block_t *get_block,
 
        /*
         * The page straddles i_size.  It must be zeroed out on each and every
-        * writepage invokation because it may be mmapped.  "A file is mapped
+        * writepage invocation because it may be mmapped.  "A file is mapped
         * in multiples of the page size.  For a file that is not a multiple of
         * the  page size, the remaining memory is zeroed when mapped, and
         * writes to that region are not written out to the file."