]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit91b993e6e60fae11675048fb73ac078cef4c6935
tree7eecaf7e01e921db23027143851694dec6cdd748
parentaa59a9beb93e5b9ed99f7dbb87ab92eab4a1ba35
parentf372a900d9c4903f7eb83ef9c2270e6329ace655
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