Merge branch 'devel'
Trond Myklebust [Thu, 24 Apr 2008 18:01:02 +0000 (14:01 -0400)]
1  2 
fs/Kconfig
fs/nfs/dir.c
fs/nfs/file.c
fs/nfs/inode.c
fs/nfs/super.c
net/sunrpc/auth_gss/auth_gss.c
net/sunrpc/clnt.c
net/sunrpc/rpcb_clnt.c
net/sunrpc/xprtsock.c

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
Simple merge
Simple merge
Simple merge
Simple merge