diff --git a/[refs] b/[refs]
index 5b0c3919b8a0..260938456cbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ddc5b6f18fbac07d2746566b73b89e89fdd4e6a
+refs/heads/master: 5e39df5625fb903587ac8e281fa57d76714996e4
diff --git a/trunk/mm/highmem.c b/trunk/mm/highmem.c
index 9c1e627f282e..bed8a8bfd01f 100644
--- a/trunk/mm/highmem.c
+++ b/trunk/mm/highmem.c
@@ -220,7 +220,7 @@ EXPORT_SYMBOL(kmap_high);
  * @page: &struct page to pin
  *
  * Returns the page's current virtual memory address, or NULL if no mapping
- * exists.  When and only when a non null address is returned then a
+ * exists.  If and only if a non null address is returned then a
  * matching call to kunmap_high() is necessary.
  *
  * This can be called from any context.