Merge branch 'devel' into next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 30 Dec 2008 21:51:43 +0000 (16:51 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 30 Dec 2008 21:51:43 +0000 (16:51 -0500)
commit08cc36cbd1ee7d86422713bb21551eed1326b894
tree52cc683387f903b34a7f6f798dcdbae385b58db8
parent3c92ec8ae91ecf59d88c798301833d7cf83f2179
parent46f72f57d279688c4524df78edb5738db730eeef
Merge branch 'devel' into next
fs/lockd/host.c
fs/nfs/nfsroot.c
fs/nfs/super.c
fs/nfsd/nfs4state.c
net/sunrpc/auth.c
net/sunrpc/clnt.c