]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Thu, 6 Mar 2014 15:53:34 +0000 (10:53 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 6 Mar 2014 15:53:34 +0000 (10:53 -0500)
1  2 
e2fsck/unix.c
e2fsck/util.c
misc/mke2fs.c

diff --cc e2fsck/unix.c
Simple merge
diff --cc e2fsck/util.c
Simple merge
diff --cc misc/mke2fs.c
Simple merge