tree 5e27d7495f8f7ce178b637d588ec42bd7b4173d8
parent 49a78d085fa6b44d6ed791923c7172a6433589c2
parent 956c920786694f51601a0ef7ee12956fd6aa216e
author Linus Torvalds <torvalds@linux-foundation.org> 1306372216 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306372216 -0700

Merge git://git.kernel.org/pub/scm/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.