]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit56fef162862d406430089e01fa67f908469e3af6
tree002733709647fa1e17683a9d21dbc23ae99e3d2d
parent6f9a5c3ee835efb32c87841d21f71bfe01323366
parentc120d5e2ad59eae9c6ba710f970dd13ed2c0229c
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