Merge branch 'sunrpc'

author Trond Myklebust <trond.myklebust@primarydata.com>

Sun, 24 Jul 2016 21:08:31 +0000 (17:08 -0400)

committer Trond Myklebust <trond.myklebust@primarydata.com>

Sun, 24 Jul 2016 21:08:31 +0000 (17:08 -0400)
author Trond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 21:08:31 +0000 (17:08 -0400)
committer Trond Myklebust <trond.myklebust@primarydata.com>
Sun, 24 Jul 2016 21:08:31 +0000 (17:08 -0400)
diff --cc net/sunrpc/clnt.c
Simple merge
diff --cc net/sunrpc/xprtsock.c
Simple merge
author	Trond Myklebust <trond.myklebust@primarydata.com>
	Sun, 24 Jul 2016 21:08:31 +0000 (17:08 -0400)
committer	Trond Myklebust <trond.myklebust@primarydata.com>
	Sun, 24 Jul 2016 21:08:31 +0000 (17:08 -0400)
		1	2
net/sunrpc/clnt.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprtsock.c	patch \|	diff1 \|	diff2 \|	blob \| history