diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-02 18:32:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-02 18:32:59 -0800 |
| commit | c8b4ec8351d21da3299b045b37920e5cf5590793 (patch) | |
| tree | 24143a2a29a0577df09857478a0c56794b46dfd7 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid (diff) | |
| parent | fscrypt: fix renaming and linking special files (diff) | |
| download | wireguard-linux-c8b4ec8351d21da3299b045b37920e5cf5590793.tar.xz wireguard-linux-c8b4ec8351d21da3299b045b37920e5cf5590793.zip | |
Merge tag 'fscrypt-for-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
Pull fscrypt fixes from Ted Ts'o:
"Two fscrypt bug fixes, one of which was unmasked by an update to the
crypto tree during the merge window"
* tag 'fscrypt-for-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
fscrypt: fix renaming and linking special files
fscrypt: fix the test_dummy_encryption mount option
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions