]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2152404 8094c3c)
Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Jan 2019 20:21:11 +0000 (12:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Jan 2019 20:21:11 +0000 (12:21 -0800)
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

1  2 
include/uapi/linux/fs.h patch | diff1 | diff2 | blob | history

diff --cc include/uapi/linux/fs.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.