]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'nfsd/nfsd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:28:14 +0000 (10:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:28:14 +0000 (10:28 +1100)
commit501f4d0f33b90497ebd971316a9db625c9030ee7
treebe8bda478f0a169af54bcd3c262b6cd421d86436
parent99ff2e20d6ad35ab5e5983dec86c6ef9c90d696f
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