diff --git a/[refs] b/[refs]
index 36da113597ab..4370314d8e3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cde11c1b48735dc4108cffefccf4c1817c7bfd2
+refs/heads/master: 3ff987801d0ab35794cc8a8142c14c2392a9a404
diff --git a/trunk/arch/arm/mach-spear6xx/spear6xx.c b/trunk/arch/arm/mach-spear6xx/spear6xx.c
index b67e571d4bf7..baf6bcc3169c 100644
--- a/trunk/arch/arm/mach-spear6xx/spear6xx.c
+++ b/trunk/arch/arm/mach-spear6xx/spear6xx.c
@@ -13,7 +13,6 @@
 
 #include <linux/types.h>
 #include <linux/amba/pl061.h>
-#include <linux/types.h>
 #include <linux/ptrace.h>
 #include <linux/io.h>
 #include <asm/hardware/vic.h>