diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 03:10:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 03:10:16 +0200 |
| commit | 14d74e0cab7a7779a7ff0c3863c04c8a8e507106 (patch) | |
| tree | 5e27d7495f8f7ce178b637d588ec42bd7b4173d8 /arch/cris | |
| parent | slub: remove no-longer used 'unlock_out' label (diff) | |
| parent | net: fix get_net_ns_by_fd for !CONFIG_NET_NS (diff) | |
| download | linux-14d74e0cab7a7779a7ff0c3863c04c8a8e507106.tar.xz linux-14d74e0cab7a7779a7ff0c3863c04c8a8e507106.zip | |
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.
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions