From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 6 Jan 2019 20:21:11 +0000 (-0800)
Subject: Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Tag: v5.0-rc1~5
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=baa6707381285e68cc472efba58e7e736057aacc

Merge tag 'fscrypt_for_linus' of git://git./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
---

baa6707381285e68cc472efba58e7e736057aacc