Merge branch 'setns'
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2011 17:51:01 +0000 (10:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 May 2011 17:51:01 +0000 (10:51 -0700)
commit571503e10045c89af951962ea0bb783482663aad
treeb24af1e4b5c67e2da940991b8219f8f8c4e7ac0a
parent29a6ccca3869bbe33879dae0cd7df2a1559eff54
parent7b21fddd087678a70ad64afc0f632e0f1071b092
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
arch/arm/include/asm/unistd.h
arch/arm/kernel/calls.S