Merge branch 'devel'

fs/Kconfig

fs/lockd/clntproc.c

fs/lockd/host.c

fs/lockd/mon.c

fs/lockd/svc.c

fs/nfs/Makefile

fs/nfs/client.c

fs/nfs/dir.c

fs/nfs/direct.c

fs/nfs/file.c

fs/nfs/inode.c

fs/nfs/internal.h

fs/nfs/namespace.c

fs/nfs/nfs2xdr.c

fs/nfs/nfs3xdr.c

fs/nfs/nfs4proc.c

fs/nfs/nfs4state.c

fs/nfs/nfs4xdr.c

fs/nfs/read.c

fs/nfs/super.c