Merge branch 'devel'

diff --cc fs/Kconfig
Simple merge

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

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

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

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

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

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

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

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