From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 9 Jan 2017 01:57:35 +0000 (-0500)
Subject: Merge branch 'fscrypt' into d
X-Git-Tag: v4.11-rc1~147^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56735be05353b085a0862ca4c4943628df3420ca;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'fscrypt' into d
---

56735be05353b085a0862ca4c4943628df3420ca