Merge branch 'nfs-for-2.6.32'
Trond Myklebust [Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)]
1  2 
fs/nfs/client.c
net/sunrpc/clnt.c

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