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: 4c11e65 af2eac4)

author	Theodore Ts'o <tytso@mit.edu>
	Tue, 2 Jan 2018 05:53:10 +0000 (00:53 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 2 Jan 2018 05:53:10 +0000 (00:53 -0500)
commit	df22ead1bae8f97eea36976fd354bb05042ad92b
tree	b1975f1492f1f1d6fb512ec9dc3361a5e124fa09	tree
parent	4c11e6556e80e89393f925c6fd88058c1dceb9c2	commit \| diff
parent	af2eac481cf426c05ae12b946396980e16c8ab19	commit \| diff

Merge branch 'maint' into next

debugfs/debugfs.c	diff1 \|	diff2 \|	blob \| history
debugfs/set_fields.c	diff1 \|	diff2 \|	blob \| history
debugfs/xattrs.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/swapfs.c	diff1 \|	diff2 \|	blob \| history
misc/create_inode.c	diff1 \|	diff2 \|	blob \| history
misc/ext4.5.in	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	diff1 \|	diff2 \|	blob \| history

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