]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Wed, 5 Nov 2014 16:15:06 +0000 (11:15 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 5 Nov 2014 16:15:06 +0000 (11:15 -0500)
1  2 
e2fsck/pass2.c

diff --cc e2fsck/pass2.c
Simple merge