]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'nfs/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 00:21:24 +0000 (11:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 00:21:24 +0000 (11:21 +1100)
1  2 
net/sunrpc/xprtsock.c

Simple merge