]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:52:02 +0000 (10:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Oct 2012 23:52:02 +0000 (10:52 +1100)
commitb94ad150b188ca625a2aac370121d5fcec29cc6b
tree136e7dcf2046797f82fc42476ae844e11e923e21
parentd1b1e17e2462f2fccf667ee3c84442edfb3e7e1a
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