Merge branch 'devel' into for-linus
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 1 Apr 2009 17:28:15 +0000 (13:28 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 1 Apr 2009 17:28:15 +0000 (13:28 -0400)
commitcc85906110e26fe8537c3bdbc08a74ae8110030b
tree891813098ede3dba4d5ff3b83b1f7b491367ad2f
parentc09bca786ff941ed17c5f381c4eca5b106808c51
parentc69da774b28e01e062e0a3aba7509f2dcfd2a11a
Merge branch 'devel' into for-linus
fs/nfs/client.c
fs/nfs/dir.c
fs/nfs/file.c
include/linux/nfs_fs.h
include/linux/nfs_xdr.h
net/sunrpc/svc.c
net/sunrpc/xprtsock.c