]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Nov 2012 23:44:12 +0000 (10:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Nov 2012 23:44:12 +0000 (10:44 +1100)
1  2 
net/sunrpc/svc.c

Simple merge