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.
This commit is contained in:
J. Bruce Fields 2015-02-02 11:29:29 -05:00
commit a584143b01
328 changed files with 3749 additions and 2117 deletions