Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-powerpc/unistd.h
	include/asm-sparc/unistd.h
	include/asm-sparc64/unistd.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h
index 9e2c9e1c1239..eb66eae6616f 100644
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
@@ -321,10 +321,12 @@
 #define __NR_readlinkat         296
 #define __NR_fchmodat           297
 #define __NR_faccessat          298
+#define __NR_get_robust_list    299
+#define __NR_set_robust_list    300
 
 #ifdef __KERNEL__
 
-#define __NR_syscalls           299
+#define __NR_syscalls           301
 
 #define __NR__exit __NR_exit
 #define NR_syscalls     __NR_syscalls