projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f74f97 d4e4ab8)
Merge tag 'v3.11-rc5' into for-3.12 branch
authorJ. Bruce Fields <bfields@redhat.com>
Fri, 30 Aug 2013 20:42:49 +0000 (16:42 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 30 Aug 2013 20:42:49 +0000 (16:42 -0400)
For testing purposes I want some nfs and nfsd bugfixes (specifically,
58cd57bfd9db3bc213bf9d6a10920f82095f0114 and previous nfsd patches, and
Trond's 4f3cc4809a98a165a9708b72b47de71643797bbd).

1  2 
fs/nfsd/nfs4state.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfsd/nfs4state.c
Simple merge