diff options
author | 2015-01-15 10:38:07 +1300 | |
---|---|---|
committer | 2015-01-15 10:38:07 +1300 | |
commit | fb005c47f7b72edac50342b6af490af09854381b (patch) | |
tree | 45612e66ef8f56bd7c72b51bc4a30108b3344cad /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
parent | locks: fix NULL-deref in generic_delete_lease (diff) | |
download | wireguard-linux-fb005c47f7b72edac50342b6af490af09854381b.tar.xz wireguard-linux-fb005c47f7b72edac50342b6af490af09854381b.zip |
Merge tag 'locks-v3.19-1' of git://git.samba.org/jlayton/linux
Pull file locking fix from Jeff Layton:
"Just a simple bugfix for a regression that I introduced into v3.18
with the internal lease API overhaul -- mea culpa. Kudos to Linda and
Neil for tracking this down and fixing it"
* tag 'locks-v3.19-1' of git://git.samba.org/jlayton/linux:
locks: fix NULL-deref in generic_delete_lease
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions