]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0be952c a9b1b45)
Merge tag 'locks-v4.0-4' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2015 17:02:21 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2015 17:02:21 +0000 (10:02 -0700)
commit0f0910a100951204a48052ce62ca72915511ecc6
tree7eecaf7e01e921db23027143851694dec6cdd748tree | snapshot
parent0be952c13be80ccdd3cb0d1ba25099de9468ac1bcommit | diff
parenta9b1b455c519ee2fd6a4f9c069511e67b5be1ac4commit | diff
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
Michael's Linux tree.