Merge tag 'locks-v4.0-5' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2015 22:13:04 +0000 (15:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Mar 2015 22:13:04 +0000 (15:13 -0700)
commit6c310bc1acdd02110182a2ec6efa3e7571a3b80c
treed064cf352a25f9485b74cb03520fcab7f93859b3
parent32374ea8fe1196e045c9e74078a662664af8971c
parenta901125c65544aa05c52e1a7388c3900e8af105f
Merge tag 'locks-v4.0-5' of git://git.samba.org/jlayton/linux

Pull file locking fix from Jeff Layton:
 "Another small fix for the lease overhaul"

* tag 'locks-v4.0-5' of git://git.samba.org/jlayton/linux:
  locks: fix file_lock deletion inside loop