]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:47:47 +0000 (09:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:47:47 +0000 (09:47 +1100)
commitbb0e1ef3c2112d50e16a3681b69e7e4716d06cfc
tree1d29dba9f4670a7b57d1d32796600ce94140156d
parent507eff81c2b0afdeeede6d25a70e61ec9cc277d1
parent0d22f68f02c10d5d10ec5712917e5828b001a822
Merge remote-tracking branch 'nfsd/nfsd-next'
fs/lockd/svc.c
fs/locks.c
fs/nfs/callback.c
fs/nfsd/nfs4state.c
fs/nfsd/vfs.c