Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorDavid S. Miller <davem@davemloft.net>
Thu, 14 Apr 2016 04:39:15 +0000 (00:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 14 Apr 2016 04:39:15 +0000 (00:39 -0400)
1  2 
net/socket.c

diff --cc net/socket.c
Simple merge