diff --git a/[refs] b/[refs]
index 2735a6e3491b..b782bf4951de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7127da4ee4447cb718c5ae553878458ec5e648f8
+refs/heads/master: 5077c2a9cd43e8db71f8257e745e1d27e7b79d3f
diff --git a/trunk/arch/um/include/asm/processor-i386.h b/trunk/arch/um/include/asm/processor-i386.h
index a2b7fe13fe1e..4f8be0063639 100644
--- a/trunk/arch/um/include/asm/processor-i386.h
+++ b/trunk/arch/um/include/asm/processor-i386.h
@@ -48,7 +48,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
         memcpy(&to->tls_array, &from->tls_array, sizeof(from->tls_array));
 }
 
-#include "asm/arch/user.h"
+#include <asm/user.h>
 
 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
 static inline void rep_nop(void)
diff --git a/trunk/arch/um/include/asm/processor-x86_64.h b/trunk/arch/um/include/asm/processor-x86_64.h
index e50933175e91..875a26a62614 100644
--- a/trunk/arch/um/include/asm/processor-x86_64.h
+++ b/trunk/arch/um/include/asm/processor-x86_64.h
@@ -40,7 +40,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
 	to->fs = from->fs;
 }
 
-#include "asm/arch/user.h"
+#include <asm/user.h>
 
 #define current_text_addr() \
 	({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; })
diff --git a/trunk/arch/um/include/asm/ptrace-generic.h b/trunk/arch/um/include/asm/ptrace-generic.h
index 315749705ea1..6c8899013c92 100644
--- a/trunk/arch/um/include/asm/ptrace-generic.h
+++ b/trunk/arch/um/include/asm/ptrace-generic.h
@@ -8,7 +8,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include "asm/arch/ptrace-abi.h"
+#include <asm/ptrace-abi.h>
 #include <asm/user.h>
 #include "sysdep/ptrace.h"