Merge branch 'nfs-for-2.6.32'

author Trond Myklebust <Trond.Myklebust@netapp.com>

Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)

committer Trond Myklebust <Trond.Myklebust@netapp.com>

Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)
author Trond Myklebust <Trond.Myklebust@netapp.com>
Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)
committer Trond Myklebust <Trond.Myklebust@netapp.com>
Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)
diff --cc fs/nfs/client.c
Simple merge
diff --cc net/sunrpc/clnt.c
Simple merge
author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)
		1	2
fs/nfs/client.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/clnt.c	patch \|	diff1 \|	diff2 \|	blob \| history