diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-06-25 10:25:09 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2018-06-25 10:25:09 +0200 |
| commit | c879f71c746c655ae03e1b828296c461b77ac8b6 (patch) | |
| tree | a289b7aadeba62776491188bcc62fe13862ff47d /fs/notify/fanotify | |
| parent | 514211f542dd6eb877adf46d400ce351c81d95ad (diff) | |
| parent | f1b0a4343c4184bef9fdea8fad41f09bbd3d63ec (diff) | |
| download | linux-stable-c879f71c746c655ae03e1b828296c461b77ac8b6.tar.gz linux-stable-c879f71c746c655ae03e1b828296c461b77ac8b6.tar.bz2 linux-stable-c879f71c746c655ae03e1b828296c461b77ac8b6.zip | |
Merge branch 'zcrypt' into features
Add the zcrypt base patches into features using a tip branch for
parallel merging via multiple tress.
Diffstat (limited to 'fs/notify/fanotify')
0 files changed, 0 insertions, 0 deletions