switch sock_alloc_file() to alloc_file()
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 6 Aug 2009 05:43:59 +0000 (09:43 +0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 16 Dec 2009 17:16:42 +0000 (12:16 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
net/socket.c

diff --cc net/socket.c
Simple merge