Merge branch 'fscrypt' into origin
authorTheodore Ts'o <tytso@mit.edu>
Mon, 14 Nov 2016 03:02:22 +0000 (22:02 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 14 Nov 2016 03:02:22 +0000 (22:02 -0500)
commit6da22013bb7907b33c87968c25034b409a6161a2
treef23cd3da57b7188241f7e2c9d2390fbc672ce3d4
parenta2f6d9c4c081ec2a02529b8af2c04f3e557a3a3e
parenta6e08912861757b8b335cc49b093a51ec025c5de
Merge branch 'fscrypt' into origin
fs/ext4/inode.c