Merge branch 'devel' into next

diff --cc fs/lockd/host.c
Simple merge

diff --cc fs/nfs/nfsroot.c
Simple merge

diff --cc fs/nfs/super.c
Simple merge

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc net/sunrpc/auth.c
Simple merge

diff --cc net/sunrpc/clnt.c
Simple merge