projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f405425 190f38e)
Merge branch 'nfs-for-2.6.33'
authorTrond Myklebust <[email protected]>
Sun, 13 Dec 2009 18:56:27 +0000 (13:56 -0500)
committerTrond Myklebust <[email protected]>
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

diff --cc fs/nfs/write.c
Simple merge
diff --cc net/sunrpc/auth.c
Simple merge
diff --cc net/sunrpc/xprtsock.c
Simple merge
John Crispins staging tree