projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 31238e6 52d304e)
Merge tag 'locks-v3.19-1' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Jan 2015 21:38:07 +0000 (10:38 +1300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Jan 2015 21:38:07 +0000 (10:38 +1300)
commitfb005c47f7b72edac50342b6af490af09854381b
tree45612e66ef8f56bd7c72b51bc4a30108b3344cadtree | snapshot
parent31238e61b51f5a68bb8630ddb60ede475846d698commit | diff
parent52d304eb4eaced9ad04b64ba7cd6ceb5153bbf18commit | 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
Unnamed repository; edit this file 'description' to name the repository.