git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e576e05 c05988c)
Merge branch 'patches_cel-for-2.6.32' into nfs-for-2.6.32
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 10 Aug 2009 21:45:50 +0000 (17:45 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 10 Aug 2009 21:45:50 +0000 (17:45 -0400)
1  2 
fs/nfs/internal.h patch | diff1 | diff2 | blob | history
fs/nfs/mount_clnt.c patch | diff1 | diff2 | blob | history
net/sunrpc/xprtsock.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/internal.h
Simple merge
diff --cc fs/nfs/mount_clnt.c
Simple merge
diff --cc net/sunrpc/xprtsock.c
Simple merge
Pandora Kernel Repository