diff --git a/[refs] b/[refs]
index dd8608bdc9e2..9d44e45c0fdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9049a11de73d3ecc623f1903100d099f82ede56c
+refs/heads/master: b924a28138572f03bc8647c2be8f876d27e2666a
diff --git a/trunk/arch/x86/include/asm/pgtable-2level-defs.h b/trunk/arch/x86/include/asm/pgtable-2level_types.h
similarity index 100%
rename from trunk/arch/x86/include/asm/pgtable-2level-defs.h
rename to trunk/arch/x86/include/asm/pgtable-2level_types.h
diff --git a/trunk/arch/x86/include/asm/pgtable-3level-defs.h b/trunk/arch/x86/include/asm/pgtable-3level_types.h
similarity index 100%
rename from trunk/arch/x86/include/asm/pgtable-3level-defs.h
rename to trunk/arch/x86/include/asm/pgtable-3level_types.h
diff --git a/trunk/arch/x86/include/asm/pgtable_32.h b/trunk/arch/x86/include/asm/pgtable_32.h
index 1952bb762aac..72d20e2a40f2 100644
--- a/trunk/arch/x86/include/asm/pgtable_32.h
+++ b/trunk/arch/x86/include/asm/pgtable_32.h
@@ -39,11 +39,11 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
  * newer 3-level PAE-mode page tables.
  */
 #ifdef CONFIG_X86_PAE
-# include <asm/pgtable-3level-defs.h>
+# include <asm/pgtable-3level_types.h>
 # define PMD_SIZE	(1UL << PMD_SHIFT)
 # define PMD_MASK	(~(PMD_SIZE - 1))
 #else
-# include <asm/pgtable-2level-defs.h>
+# include <asm/pgtable-2level_types.h>
 #endif
 
 #define PGDIR_SIZE	(1UL << PGDIR_SHIFT)