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: 175d43b 855a77a)

author	Theodore Ts'o <tytso@mit.edu>
	Mon, 21 Feb 2011 02:54:43 +0000 (21:54 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 21 Feb 2011 02:54:43 +0000 (21:54 -0500)
commit	214580a339a18b0539b5998d3b47934956a30a1c
tree	e32d439027d14735d44372e01450e6d02e9c6447	tree \| snapshot
parent	175d43beada4f5c971fa4b495380620644705282	commit \| diff
parent	855a77a19704ef7e0acd542cce19a6e8ee07582d	commit \| diff

Merge branch 'maint' into next

Conflicts:
misc/mke2fs.conf.5.in

lib/ext2fs/initialize.c	diff1 \|	diff2 \|	blob \| history
misc/badblocks.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.8.in	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.conf	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.conf.5.in	diff1 \|	diff2 \|	blob \| history

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