Merge branch 'fscrypt' into dev
authorTheodore Ts'o <tytso@mit.edu>
Tue, 13 Dec 2016 02:50:28 +0000 (21:50 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 13 Dec 2016 02:50:28 +0000 (21:50 -0500)
commita551d7c8deefb6d9fb45a1de03a617dd064e0419
treec58f83ef3edd83d55f8f574cfe7ba023e029090b
parent0cb80b4847553582830a59da2c022c37a1f4a119
parent6a34e4d2be07255cc59e6ccaf820669cfd7f815c
Merge branch 'fscrypt' into dev
fs/ext4/ext4.h
fs/ext4/inode.c
fs/ext4/ioctl.c