]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Fri, 4 Aug 2017 16:30:01 +0000 (12:30 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 4 Aug 2017 16:30:01 +0000 (12:30 -0400)
1  2 
e2fsck/rehash.c
lib/e2p/Makefile.in

diff --cc e2fsck/rehash.c
Simple merge
Simple merge