diff --git a/[refs] b/[refs]
index 4ca0dd5bc32f..0a8b6b528fda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dc8ab86e0724642e2f778116de64f4b832d7d94
+refs/heads/master: df42654e90b3045691f4c327075897aed9691ebe
diff --git a/trunk/include/asm-h8300/timer.h b/trunk/arch/h8300/include/asm/timer.h
similarity index 100%
rename from trunk/include/asm-h8300/timer.h
rename to trunk/arch/h8300/include/asm/timer.h
diff --git a/trunk/include/asm-arm/.gitignore b/trunk/include/asm-arm/.gitignore
deleted file mode 100644
index e02c15d158fc..000000000000
--- a/trunk/include/asm-arm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-arch
-mach-types.h