diff --git a/[refs] b/[refs]
index 2fd151809bcd..ae59cd832829 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 618febd6784054eea928d712b7e564558a7cefd5
+refs/heads/master: 05aa10de701409b893484d2901c8974b3382f8fe
diff --git a/trunk/include/asm-parisc/errno.h b/trunk/include/asm-parisc/errno.h
index 08464c405471..e2f3ddc796be 100644
--- a/trunk/include/asm-parisc/errno.h
+++ b/trunk/include/asm-parisc/errno.h
@@ -114,6 +114,7 @@
 
 #define ENOTSUP		252	/* Function not implemented (POSIX.4 / HPUX) */
 #define ECANCELLED	253	/* aio request was canceled before complete (POSIX.4 / HPUX) */
+#define ECANCELED	ECANCELLED	/* SuSv3 and Solaris wants one 'L' */
 
 /* for robust mutexes */
 #define EOWNERDEAD	254	/* Owner died */