merge sock_alloc_fd/sock_attach_fd into a new helper
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 5 Aug 2009 15:59:08 +0000 (19:59 +0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 16 Dec 2009 17:16:41 +0000 (12:16 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
net/socket.c

diff --cc net/socket.c
Simple merge