]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Fri, 15 Apr 2016 15:33:30 +0000 (11:33 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 15 Apr 2016 15:33:30 +0000 (11:33 -0400)
1  2 
misc/e2image.c

diff --cc misc/e2image.c
Simple merge