projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1205065 b0c3844)
Merge commit 'v2.6.37-rc6' into for-2.6.38
authorJ. Bruce Fields <bfields@redhat.com>
Fri, 17 Dec 2010 18:29:07 +0000 (13:29 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 17 Dec 2010 18:29:07 +0000 (13:29 -0500)
1  2 
fs/nfsd/nfs4state.c patch | diff1 | diff2 | blob | history
net/sunrpc/svc_xprt.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfsd/nfs4state.c
Simple merge
diff --cc net/sunrpc/svc_xprt.c
Simple merge