]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Tue, 21 Aug 2018 05:23:18 +0000 (01:23 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 21 Aug 2018 05:23:18 +0000 (01:23 -0400)
1  2 
lib/ext2fs/ext2fs.h
misc/tune2fs.c

Simple merge
diff --cc misc/tune2fs.c
Simple merge