]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 01:25:18 +0000 (12:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 01:25:18 +0000 (12:25 +1100)
1  2 
net/sunrpc/xprtsock.c

Simple merge