git.ipfire.org Git - thirdparty/e2fsprogs.git/commit

]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit

projects / thirdparty / e2fsprogs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 188960e 19961cd)

author	Theodore Ts'o <tytso@mit.edu>
	Mon, 30 Nov 2015 23:16:36 +0000 (18:16 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 30 Nov 2015 23:16:36 +0000 (18:16 -0500)
commit	94676ef2b30d80c11008f0e13c77029e286bd0d7
tree	2aaeccf1a49db567b1332ac5be9daac1072c6b2b	tree \| snapshot
parent	188960ea4b830ec69607aab3068537ce55f44be4	commit \| diff
parent	19961cd0003564c63c33ec14e69dfec6d81a2238	commit \| diff

Merge branch 'maint' into next

12 files changed:

e2fsck/e2fsck.c	diff1 \|	diff2 \|	blob \| history
e2fsck/e2fsck.h	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1.c	diff1 \|	diff2 \|	blob \| history
e2fsck/pass2.c	diff1 \|	diff2 \|	blob \| history
e2fsck/problem.c	diff1 \|	diff2 \|	blob \| history
e2fsck/problem.h	diff1 \|	diff2 \|	blob \| history
e2fsck/rehash.c	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/punch.c	diff1 \|	diff2 \|	blob \| history
misc/chattr.1.in	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	diff1 \|	diff2 \|	blob \| history
tests/f_extents/expect.1	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.