Merge branch 'master'; commit 'v2.6.39-rc3' into next

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 0b56c6b7ec01..c05d6dcf77a4 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -622,7 +622,7 @@ static int ntfs_read_locked_inode(struct inode *vi)
          */
         /* Everyone gets all permissions. */
         vi->i_mode |= S_IRWXUGO;
-        /* If read-only, noone gets write permissions. */
+        /* If read-only, no one gets write permissions. */
         if (IS_RDONLY(vi))
                 vi->i_mode &= ~S_IWUGO;
         if (m->flags & MFT_RECORD_IS_DIRECTORY) {
@@ -2529,7 +2529,7 @@ retry_truncate:
                  * specifies that the behaviour is unspecified thus we do not
                  * have to do anything.  This means that in our implementation
                  * in the rare case that the file is mmap()ped and a write
-                 * occured into the mmap()ped region just beyond the file size
+                 * occurred into the mmap()ped region just beyond the file size
                  * and writepage has not yet been called to write out the page
                  * (which would clear the area beyond the file size) and we now
                  * extend the file size to incorporate this dirty region