]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 234f89e ddd2c0f)
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)
commit5c467fea96575336e487516ff3e30f5e0f39bc67
tree002733709647fa1e17683a9d21dbc23ae99e3d2dtree | snapshot
parent234f89e1e44261158d1fc178425311dd73d54923commit | diff
parentddd2c0fc163c260bf6a1eac9c5a0b01d461402e1commit | 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
Linux Kernel Source Tree.