| commit | fb005c47f7b72edac50342b6af490af09854381b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 15 10:38:07 2015 +1300 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 15 10:38:07 2015 +1300 |
| tree | 45612e66ef8f56bd7c72b51bc4a30108b3344cad | |
| parent | 31238e61b51f5a68bb8630ddb60ede475846d698 [diff] | |
| parent | 52d304eb4eaced9ad04b64ba7cd6ceb5153bbf18 [diff] |
Merge tag 'locks-v3.19-1' of git://git.samba.org/jlayton/linux Pull file locking fix from Jeff Layton: "Just a simple bugfix for a regression that I introduced into v3.18 with the internal lease API overhaul -- mea culpa. Kudos to Linda and Neil for tracking this down and fixing it" * tag 'locks-v3.19-1' of git://git.samba.org/jlayton/linux: locks: fix NULL-deref in generic_delete_lease