Merge branch 'sunrpc'
authorTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 21:08:31 +0000 (17:08 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 21:08:31 +0000 (17:08 -0400)
1  2 
net/sunrpc/clnt.c
net/sunrpc/xprtsock.c

Simple merge
Simple merge