diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 17:17:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 17:17:32 -0500 |
| commit | 22fed39775c6f06e275075e1570e1cebb12593e0 (patch) | |
| tree | d4390cd5c2badd7f468367d695f7a0bc71204b78 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm6... (diff) | |
| parent | orangefs: minimum userspace version is 2.9.3 (diff) | |
| download | linux-22fed39775c6f06e275075e1570e1cebb12593e0.tar.gz linux-22fed39775c6f06e275075e1570e1cebb12593e0.zip | |
Merge tag 'for-linus' of git://github.com/martinbrandenburg/linux
Pull OrangeFS fixes from Martin Brandenburg:
"Two bugfixes for OrangeFS.
One is a reference counting bug and the other is a typo in client
minimum version"
* tag 'for-linus' of git://github.com/martinbrandenburg/linux:
orangefs: minimum userspace version is 2.9.3
orangefs: don't put readdir slot twice
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions