]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Wed, 1 Oct 2014 12:36:28 +0000 (08:36 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 1 Oct 2014 12:36:28 +0000 (08:36 -0400)
1  2 
misc/mke2fs.c
misc/mke2fs.conf.in

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