diff --git a/[refs] b/[refs]
index 723d852c1249..c3331832e7e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0420c87e648a3b623ad925038a0bcff2ef5a4bc9
+refs/heads/master: 11b8d2460c538697b813a8281db783f7bb7eb0ef
diff --git a/trunk/arch/mn10300/include/uapi/asm/setup.h b/trunk/arch/mn10300/include/uapi/asm/setup.h
index e69de29bb2d1..ae5704fa77ad 100644
--- a/trunk/arch/mn10300/include/uapi/asm/setup.h
+++ b/trunk/arch/mn10300/include/uapi/asm/setup.h
@@ -0,0 +1,4 @@
+/*
+ * There isn't anything here anymore, but the file must not be empty or patch
+ * will delete it.
+ */