]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit430b4d2fcc9b4fdcd7b363465d79a08c8b0021e1
tree45612e66ef8f56bd7c72b51bc4a30108b3344cad
parent74c313a8a0a3a878cc80668c2c3aadace0424baa
parentd6c80e4b2db3070de047713c171fe9093f8d16af
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