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: 3304da1 e1af954)

author	Theodore Ts'o <tytso@mit.edu>
	Thu, 28 Jan 2021 05:52:22 +0000 (00:52 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 28 Jan 2021 05:52:22 +0000 (00:52 -0500)
commit	6be3ce7a545d3b49199e65cdde709ad51d1be502
tree	7970537931cffcebae9380b9daced36df34baecb	tree \| snapshot
parent	3304da1696f85225779b11aef420fdba9a20175a	commit \| diff
parent	e1af9546e6a1572cbd7d8b70cf5344b5f7e2f51b	commit \| diff

Merge branch 'maint' into next

13 files changed:

e2fsck/Android.bp	diff1 \|	diff2 \|	blob \| history
e2fsck/e2fsck.c	diff1 \|	diff2 \|	blob \| history
e2fsck/e2fsck.h	diff1 \|	diff2 \|	blob \| history
e2fsck/jfs_user.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
lib/ext2fs/ext2_fs.h	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.8.in	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	diff1 \|	diff2 \|	blob \| history

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