projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 332a339 2ecda72)
Merge branch 'nfs-for-2.6.32'
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 11 Sep 2009 18:59:37 +0000 (14:59 -0400)
committerTrond 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

diff --cc fs/nfs/client.c
Simple merge
diff --cc net/sunrpc/clnt.c
Simple merge
John Crispins staging tree