Merge branches 'irq-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel...

[~andy/linux] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 41f82bb59eec5c083e254d5db10e0eb747412ec2..048a95a5244d4eb5522c7aa17fa94ca625f660f5 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -779,7 +779,7 @@ static int shmem_notify_change(struct dentry *dentry, struct iattr *attr)
                         * If truncating down to a partial page, then
                         * if that page is already allocated, hold it
                         * in memory until the truncation is over, so
-                        * truncate_partial_page cannnot miss it were
+                        * truncate_partial_page cannot miss it were
                         * it assigned to swap.
                         */
                        if (newsize & (PAGE_CACHE_SIZE-1)) {