]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34123da 72ab373)
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 27 Oct 2005 23:12:49 +0000 (19:12 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 27 Oct 2005 23:12:49 +0000 (19:12 -0400)
1  2 
net/sunrpc/svcsock.c patch | diff1 | diff2 | blob | history

diff --cc net/sunrpc/svcsock.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.