diff --git a/[refs] b/[refs]
index c420195e0154..fb315261a8dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aefd18f01ee848448d834c80e601ccff61515811
+refs/heads/master: 21bbe18b2d53e0941cbd1621400ba7b4028972cb
diff --git a/trunk/Documentation/kvm/mmu.txt b/trunk/Documentation/kvm/mmu.txt
index 8cb42b957c73..142cc5136650 100644
--- a/trunk/Documentation/kvm/mmu.txt
+++ b/trunk/Documentation/kvm/mmu.txt
@@ -77,10 +77,10 @@ Memory
 
 Guest memory (gpa) is part of the user address space of the process that is
 using kvm.  Userspace defines the translation between guest addresses and user
-addresses (gpa->hva); note that two gpas may alias to the same gva, but not
+addresses (gpa->hva); note that two gpas may alias to the same hva, but not
 vice versa.
 
-These gvas may be backed using any method available to the host: anonymous
+These hvas may be backed using any method available to the host: anonymous
 memory, file backed memory, and device memory.  Memory might be paged by the
 host at any time.