diff --git a/[refs] b/[refs]
index 4af7e741f561..55bdfce322e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1181c1f923c349acaa01bca40fe600584f265132
+refs/heads/master: 4750e2c0c59e0c84c6c036b3d96ebd88365ae7ee
diff --git a/trunk/include/asm-alpha/errno.h b/trunk/include/asm-alpha/errno.h
index c85ab6b9d6c6..69e2655249d2 100644
--- a/trunk/include/asm-alpha/errno.h
+++ b/trunk/include/asm-alpha/errno.h
@@ -116,4 +116,8 @@
 #define	EKEYREVOKED	134	/* Key has been revoked */
 #define	EKEYREJECTED	135	/* Key was rejected by service */
 
+/* for robust mutexes */
+#define	EOWNERDEAD	136	/* Owner died */
+#define	ENOTRECOVERABLE	137	/* State not recoverable */
+
 #endif
diff --git a/trunk/include/asm-generic/errno.h b/trunk/include/asm-generic/errno.h
index 4dd2384bc38d..e8852c092fea 100644
--- a/trunk/include/asm-generic/errno.h
+++ b/trunk/include/asm-generic/errno.h
@@ -102,4 +102,8 @@
 #define	EKEYREVOKED	128	/* Key has been revoked */
 #define	EKEYREJECTED	129	/* Key was rejected by service */
 
+/* for robust mutexes */
+#define	EOWNERDEAD	130	/* Owner died */
+#define	ENOTRECOVERABLE	131	/* State not recoverable */
+
 #endif
diff --git a/trunk/include/asm-mips/errno.h b/trunk/include/asm-mips/errno.h
index 2b458f9538cd..3c0d840e4577 100644
--- a/trunk/include/asm-mips/errno.h
+++ b/trunk/include/asm-mips/errno.h
@@ -115,6 +115,10 @@
 #define	EKEYREVOKED	163	/* Key has been revoked */
 #define	EKEYREJECTED	164	/* Key was rejected by service */
 
+/* for robust mutexes */
+#define	EOWNERDEAD	165	/* Owner died */
+#define	ENOTRECOVERABLE	166	/* State not recoverable */
+
 #define EDQUOT		1133	/* Quota exceeded */
 
 #ifdef __KERNEL__
diff --git a/trunk/include/asm-parisc/errno.h b/trunk/include/asm-parisc/errno.h
index a10f109770f1..08464c405471 100644
--- a/trunk/include/asm-parisc/errno.h
+++ b/trunk/include/asm-parisc/errno.h
@@ -115,5 +115,9 @@
 #define ENOTSUP		252	/* Function not implemented (POSIX.4 / HPUX) */
 #define ECANCELLED	253	/* aio request was canceled before complete (POSIX.4 / HPUX) */
 
+/* for robust mutexes */
+#define EOWNERDEAD	254	/* Owner died */
+#define ENOTRECOVERABLE	255	/* State not recoverable */
+
 
 #endif
diff --git a/trunk/include/asm-sparc/errno.h b/trunk/include/asm-sparc/errno.h
index 8c01c5f3b06d..ed41c8bac1fa 100644
--- a/trunk/include/asm-sparc/errno.h
+++ b/trunk/include/asm-sparc/errno.h
@@ -107,4 +107,8 @@
 #define	EKEYREVOKED	130	/* Key has been revoked */
 #define	EKEYREJECTED	131	/* Key was rejected by service */
 
+/* for robust mutexes */
+#define	EOWNERDEAD	132	/* Owner died */
+#define	ENOTRECOVERABLE	133	/* State not recoverable */
+
 #endif
diff --git a/trunk/include/asm-sparc64/errno.h b/trunk/include/asm-sparc64/errno.h
index cc98a73b55a7..ea3509ee1b0b 100644
--- a/trunk/include/asm-sparc64/errno.h
+++ b/trunk/include/asm-sparc64/errno.h
@@ -107,4 +107,8 @@
 #define	EKEYREVOKED	130	/* Key has been revoked */
 #define	EKEYREJECTED	131	/* Key was rejected by service */
 
+/* for robust mutexes */
+#define	EOWNERDEAD	132	/* Owner died */
+#define	ENOTRECOVERABLE	133	/* State not recoverable */
+
 #endif /* !(_SPARC64_ERRNO_H) */