]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
1  2 
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

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