projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 149a4fd ce27230)
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 patch | diff1 | diff2 | blob | history
net/sunrpc/xprtsock.c patch | diff1 | diff2 | blob | history

diff --cc net/sunrpc/clnt.c
Simple merge
diff --cc net/sunrpc/xprtsock.c
Simple merge
John Crispins staging tree