Merge branch 'cleanups' into next

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

Fri, 29 Feb 2008 07:48:05 +0000 (23:48 -0800)

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

Fri, 29 Feb 2008 07:48:05 +0000 (23:48 -0800)
author Trond Myklebust <Trond.Myklebust@netapp.com>
Fri, 29 Feb 2008 07:48:05 +0000 (23:48 -0800)
committer Trond Myklebust <Trond.Myklebust@netapp.com>
Fri, 29 Feb 2008 07:48:05 +0000 (23:48 -0800)
diff --cc fs/nfs/write.c
Simple merge
diff --cc net/sunrpc/clnt.c
Simple merge
author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Fri, 29 Feb 2008 07:48:05 +0000 (23:48 -0800)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Fri, 29 Feb 2008 07:48:05 +0000 (23:48 -0800)
		1	2
fs/nfs/write.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/sunrpc/clnt.c	patch \|	diff1 \|	diff2 \|	blob \| history