diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-06 12:21:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-06 12:21:11 -0800 |
| commit | baa6707381285e68cc472efba58e7e736057aacc (patch) | |
| tree | a5687bdc023a250ce089355d3032043708da8807 /fs/iomap.c | |
| parent | 215240462a9672db771bb60adcc1c4fdf40e8ec4 (diff) | |
| parent | 8094c3ceb21ad93896fd4d238e8ba41911932eaf (diff) | |
| download | linux-baa6707381285e68cc472efba58e7e736057aacc.tar.gz linux-baa6707381285e68cc472efba58e7e736057aacc.tar.bz2 linux-baa6707381285e68cc472efba58e7e736057aacc.zip | |
Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
Pull fscrypt updates from Ted Ts'o:
"Add Adiantum support for fscrypt"
* tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
fscrypt: add Adiantum support
Diffstat (limited to 'fs/iomap.c')
0 files changed, 0 insertions, 0 deletions