projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commita584143b01ce69803116ae8d0a4db382acc728d7
tree002733709647fa1e17683a9d21dbc23ae99e3d2dtree | snapshot (tar.gz zip)
parent4c94e13e9caed09103419c087f436d79f9d2fabacommit | diff
parent8116bf4cb62d337c953cfa5369ef4cf83e73140ccommit | diff
Merge branch 'locks-3.20' of git://git.samba.org/jlayton/linux into for-3.20

Christoph's block pnfs patches have some minor dependencies on these
lock patches.
fs/nfsd/nfs4state.c diff1 | diff2 | blob | history