From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 May 2011 01:10:16 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd
X-Git-Tag: v3.12-rc1~5864
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14d74e0cab7a7779a7ff0c3863c04c8a8e507106;p=kernel%2Fkernel-generic.git

Merge git://git./linux/kernel/git/ebiederm/linux-2.6-nsfd

* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd:
  net: fix get_net_ns_by_fd for !CONFIG_NET_NS
  ns proc: Return -ENOENT for a nonexistent /proc/self/ns/ entry.
  ns: Declare sys_setns in syscalls.h
  net: Allow setting the network namespace by fd
  ns proc: Add support for the ipc namespace
  ns proc: Add support for the uts namespace
  ns proc: Add support for the network namespace.
  ns: Introduce the setns syscall
  ns: proc files for namespace naming policy.
---

14d74e0cab7a7779a7ff0c3863c04c8a8e507106