diff --git a/[refs] b/[refs]
index 268df9155c52..fc8091f91fdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 836d5ffd34550901ea024347693e689273ded8aa
+refs/heads/master: e83a9596712eb784e7e6604f43a2c140eb912743
diff --git a/trunk/include/linux/swapops.h b/trunk/include/linux/swapops.h
index d4c7db35e708..87b9d14c710d 100644
--- a/trunk/include/linux/swapops.h
+++ b/trunk/include/linux/swapops.h
@@ -4,7 +4,7 @@
  * the low-order bits.
  *
  * We arrange the `type' and `offset' fields so that `type' is at the five
- * high-order bits of the smp_entry_t and `offset' is right-aligned in the
+ * high-order bits of the swp_entry_t and `offset' is right-aligned in the
  * remaining bits.
  *
  * swp_entry_t's are *never* stored anywhere in their arch-dependent format.