projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Motorola kernel-slsi