From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 14 Mar 2015 17:02:21 +0000 (-0700)
Subject: Merge tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux
X-Git-Tag: firefly_0821_release~176^2~2158
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0f0910a100951204a48052ce62ca72915511ecc6;p=firefly-linux-kernel-4.4.55.git

Merge tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux

Pull file locking bugfix from Jeff Layton:
 "Just a small fix for a potential problem in one of the lease
  tracepoints"

* tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux:
  locks: fix generic_delete_lease tracepoint to use victim pointer
---

0f0910a100951204a48052ce62ca72915511ecc6