diff --git a/[refs] b/[refs]
index b4dc5b9198ba..d11137d1cf8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9367858dd08caf4e6ebd511abd2fca0a2d87b648
+refs/heads/master: 01fc0ac198eabcbf460e1ed058860a935b6c2c9a
diff --git a/trunk/.gitignore b/trunk/.gitignore
index 946c7ec5c922..36d9cd6d4281 100644
--- a/trunk/.gitignore
+++ b/trunk/.gitignore
@@ -52,7 +52,6 @@ include/linux/autoconf.h
 include/linux/compile.h
 include/linux/version.h
 include/linux/utsrelease.h
-include/linux/bounds.h
 include/generated
 
 # stgit generated dirs
diff --git a/trunk/Kbuild b/trunk/Kbuild
index f056b4feee51..1165d7a5ca4a 100644
--- a/trunk/Kbuild
+++ b/trunk/Kbuild
@@ -8,7 +8,7 @@
 #####
 # 1) Generate bounds.h
 
-bounds-file := include/linux/bounds.h
+bounds-file := include/generated/bounds.h
 
 always  := $(bounds-file)
 targets := $(bounds-file) kernel/bounds.s
diff --git a/trunk/Makefile b/trunk/Makefile
index 07711786dc95..b58e9312ce30 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1197,7 +1197,7 @@ MRPROPER_DIRS  += include/config include2 usr/include include/generated
 MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                   include/linux/autoconf.h include/linux/version.h      \
                   include/linux/utsrelease.h                            \
-                  include/linux/bounds.h include/asm*/asm-offsets.h     \
+                  include/asm*/asm-offsets.h                            \
 		  Module.symvers Module.markers tags TAGS cscope*
 
 # clean - Delete most, but leave enough to build external modules
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index 6f7561730d88..30fe668c2542 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -15,7 +15,7 @@
 #include <linux/seqlock.h>
 #include <linux/nodemask.h>
 #include <linux/pageblock-flags.h>
-#include <linux/bounds.h>
+#include <generated/bounds.h>
 #include <asm/atomic.h>
 #include <asm/page.h>
 
diff --git a/trunk/include/linux/page-flags.h b/trunk/include/linux/page-flags.h
index 6b202b173955..ef36725aa515 100644
--- a/trunk/include/linux/page-flags.h
+++ b/trunk/include/linux/page-flags.h
@@ -8,7 +8,7 @@
 #include <linux/types.h>
 #ifndef __GENERATING_BOUNDS_H
 #include <linux/mm_types.h>
-#include <linux/bounds.h>
+#include <generated/bounds.h>
 #endif /* !__GENERATING_BOUNDS_H */
 
 /*
diff --git a/trunk/kernel/bounds.c b/trunk/kernel/bounds.c
index 3c5301381837..98a51f26c136 100644
--- a/trunk/kernel/bounds.c
+++ b/trunk/kernel/bounds.c
@@ -12,7 +12,7 @@
 
 void foo(void)
 {
-	/* The enum constants to put into include/linux/bounds.h */
+	/* The enum constants to put into include/generated/bounds.h */
 	DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS);
 	DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES);
 	/* End of constants */