]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Ubuntu combined Linux kernel mirror