diff --git a/[refs] b/[refs]
index 1ee323c341eb..cbb0aa00e2bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd61643ef6139ba44142f2ba6e79e03267e6b54a
+refs/heads/master: 2a10e7c41254941cac87be1eccdcb6379ce097f5
diff --git a/trunk/include/asm-um/nops.h b/trunk/include/asm-um/nops.h
new file mode 100644
index 000000000000..814e9bf5dea6
--- /dev/null
+++ b/trunk/include/asm-um/nops.h
@@ -0,0 +1,6 @@
+#ifndef __UM_NOPS_H
+#define __UM_NOPS_H
+
+#include "asm/arch/nops.h"
+
+#endif