projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32374ea a901125)
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)
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


Trivial merge
John Crispins staging tree