diff --git a/[refs] b/[refs]
index cd77b9c6982f..70a1a07763c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fd59061b7b16dd0bb7bf779ba297daa5f0bf0f5
+refs/heads/master: f100e6d0368742ddb8b6b9be986536e63117c05a
diff --git a/trunk/arch/arm/include/asm/a.out.h b/trunk/arch/arm/include/asm/a.out.h
index 79489fdcc8b8..083894b2e3bc 100644
--- a/trunk/arch/arm/include/asm/a.out.h
+++ b/trunk/arch/arm/include/asm/a.out.h
@@ -2,7 +2,7 @@
 #define __ARM_A_OUT_H__
 
 #include <linux/personality.h>
-#include <asm/types.h>
+#include <linux/types.h>
 
 struct exec
 {