| commit | 6c310bc1acdd02110182a2ec6efa3e7571a3b80c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 30 15:13:04 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 30 15:13:04 2015 -0700 |
| tree | d064cf352a25f9485b74cb03520fcab7f93859b3 | |
| parent | 32374ea8fe1196e045c9e74078a662664af8971c [diff] | |
| parent | a901125c65544aa05c52e1a7388c3900e8af105f [diff] |
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