projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a121103 a5d431e)
Merge branch 'fscrypt' into d
authorTheodore Ts'o <tytso@mit.edu>
Mon, 9 Jan 2017 01:57:35 +0000 (20:57 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 9 Jan 2017 01:57:35 +0000 (20:57 -0500)

Trivial merge