Merge branch 'nfs-for-2.6.33'

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

Sun, 13 Dec 2009 18:56:27 +0000 (13:56 -0500)

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

Sun, 13 Dec 2009 18:56:27 +0000 (13:56 -0500)
author Trond Myklebust <Trond.Myklebust@netapp.com>
Sun, 13 Dec 2009 18:56:27 +0000 (13:56 -0500)
committer Trond Myklebust <Trond.Myklebust@netapp.com>
Sun, 13 Dec 2009 18:56:27 +0000 (13:56 -0500)
diff --cc fs/nfs/write.c
Simple merge
diff --cc net/sunrpc/auth.c
Simple merge
diff --cc net/sunrpc/xprtsock.c
Simple merge
author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Sun, 13 Dec 2009 18:56:27 +0000 (13:56 -0500)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Sun, 13 Dec 2009 18:56:27 +0000 (13:56 -0500)
		1	2
fs/nfs/write.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/auth.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/xprtsock.c	patch \|	diff1 \|	diff2 \|	blob \| history