]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Fri, 15 Aug 2014 23:01:24 +0000 (19:01 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 15 Aug 2014 23:01:24 +0000 (19:01 -0400)
1  2 
e2fsck/unix.c

diff --cc e2fsck/unix.c
Simple merge