]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Wed, 5 Jul 2017 03:53:11 +0000 (23:53 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 5 Jul 2017 03:53:11 +0000 (23:53 -0400)
1  2 
e2fsck/pass1.c

diff --cc e2fsck/pass1.c
Simple merge