Merge branch 'jc/upload-corrupt' into next

diff --git a/Documentation/cvs-migration.txt b/Documentation/cvs-migration.txt
index 826d0897e2fd2ad2f63677b477c9e1e0f62337ae..1fbca83141e20599e4d6edd880b1cabbf0cd9913 100644 (file)
--- a/Documentation/cvs-migration.txt
+++ b/Documentation/cvs-migration.txt
@@ -106,7 +106,7 @@ Make sure committers have a umask of at most 027, so that the directories
 they create are writable and searchable by other group members.
 
 Suppose this repository is now set up in /pub/repo.git on the host
-foo.com.  Then as an individual commiter you can clone the shared
+foo.com.  Then as an individual committer you can clone the shared
 repository:
 
 ------------------------------------------------