projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c94e13 8116bf4)
Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20
authorJ. Bruce Fields <bfields@redhat.com>
Mon, 2 Feb 2015 16:29:29 +0000 (11:29 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 2 Feb 2015 16:29:29 +0000 (11:29 -0500)
Christoph's block pnfs patches have some minor dependencies on these
lock patches.

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

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