]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Mon, 26 Feb 2018 16:13:35 +0000 (11:13 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 26 Feb 2018 16:13:35 +0000 (11:13 -0500)
1  2 
misc/tune2fs.c

diff --cc misc/tune2fs.c
Simple merge