]> err.no Git - linux-2.6/commitdiff
Merge branch 'cleanups' into next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 29 Feb 2008 07:48:05 +0000 (23:48 -0800)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 29 Feb 2008 07:48:05 +0000 (23:48 -0800)
1  2 
fs/nfs/write.c
net/sunrpc/clnt.c

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