]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Wed, 26 Apr 2017 16:03:27 +0000 (12:03 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 26 Apr 2017 16:03:27 +0000 (12:03 -0400)
1  2 
e2fsck/e2fsck.h
e2fsck/pass1.c

diff --cc e2fsck/e2fsck.h
Simple merge
diff --cc e2fsck/pass1.c
Simple merge