diff --git a/[refs] b/[refs]
index 99e8d78df447..c428294dbbb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0f5933a1626c8df7b0bfd227819c66320fb4f0f
+refs/heads/master: 6859762e8ae32ec258a671faf5c9fef07b25b83f
diff --git a/trunk/Documentation/kvm/mmu.txt b/trunk/Documentation/kvm/mmu.txt
index aaed6ab9d7ab..0e872ae30914 100644
--- a/trunk/Documentation/kvm/mmu.txt
+++ b/trunk/Documentation/kvm/mmu.txt
@@ -161,7 +161,7 @@ Shadow pages contain the following information:
   role.cr4_pae:
     Contains the value of cr4.pae for which the page is valid (e.g. whether
     32-bit or 64-bit gptes are in use).
-  role.cr4_nxe:
+  role.nxe:
     Contains the value of efer.nxe for which the page is valid.
   role.cr0_wp:
     Contains the value of cr0.wp for which the page is valid.