| commit | 0f0910a100951204a48052ce62ca72915511ecc6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 14 10:02:21 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 14 10:02:21 2015 -0700 |
| tree | 7eecaf7e01e921db23027143851694dec6cdd748 | |
| parent | 0be952c13be80ccdd3cb0d1ba25099de9468ac1b [diff] | |
| parent | a9b1b455c519ee2fd6a4f9c069511e67b5be1ac4 [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