Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index b0406d739ea..34132f8e910 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -375,7 +375,7 @@ void migrate_page_copy(struct page *newpage, struct page *page)
                  * redo the accounting that clear_page_dirty_for_io undid,
                  * but we can't use set_page_dirty because that function
                  * is actually a signal that all of the page has become dirty.
-                 * Wheras only part of our page may be dirty.
+                 * Whereas only part of our page may be dirty.
                  */
                 __set_page_dirty_nobuffers(newpage);
         }