Merge branch 'setns'

* setns:
  ns: Wire up the setns system call

Done as a merge to make it easier to fix up conflicts in arm due to
addition of sendmmsg system call

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/avr32/include/asm/unistd.h b/arch/avr32/include/asm/unistd.h
index 89861a27543e..f714544e5560 100644
--- a/arch/avr32/include/asm/unistd.h
+++ b/arch/avr32/include/asm/unistd.h
@@ -299,9 +299,10 @@
 #define __NR_signalfd           279
 /* 280 was __NR_timerfd */
 #define __NR_eventfd            281
+#define __NR_setns              283
 
 #ifdef __KERNEL__
-#define NR_syscalls             282
+#define NR_syscalls             284
 
 /* Old stuff */
 #define __IGNORE_uselib