diff --git a/[refs] b/[refs]
index 163a48d15ede..986989f38837 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 752625cff3eba81cbc886988d5b420064c033948
+refs/heads/master: 42f122c8f7e7134c824907358a5df94cfa38946d
diff --git a/trunk/.gitignore b/trunk/.gitignore
index 5014bfa48ac1..a4b576eb9c00 100644
--- a/trunk/.gitignore
+++ b/trunk/.gitignore
@@ -23,6 +23,7 @@ Module.symvers
 # Generated include files
 #
 include/asm
+include/asm-*/asm-offsets.h
 include/config
 include/linux/autoconf.h
 include/linux/compile.h
diff --git a/trunk/include/asm-mips/.gitignore b/trunk/include/asm-mips/.gitignore
deleted file mode 100644
index 4ec57ad5bc3c..000000000000
--- a/trunk/include/asm-mips/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-asm_offsets.h