Merge branch 'devel' into for-linus

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

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

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

diff --cc include/linux/nfs_fs.h
Simple merge

diff --cc include/linux/nfs_xdr.h
Simple merge

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

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