From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Jan 2015 21:38:07 +0000 (+1300)
Subject: Merge tag 'locks-v3.19-1' of git://git.samba.org/jlayton/linux
X-Git-Tag: MMI-PSA29.97-13-9~10827
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fb005c47f7b72edac50342b6af490af09854381b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

fb005c47f7b72edac50342b6af490af09854381b