]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:29:30 +0000 (10:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Oct 2012 23:29:30 +0000 (10:29 +1100)
1  2 
fs/lockd/svc.c
fs/nfs/callback.c

diff --cc fs/lockd/svc.c
Simple merge
Simple merge