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: b70506b d085f61)

author	Theodore Ts'o <tytso@mit.edu>
	Mon, 13 Dec 2010 14:16:09 +0000 (09:16 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 13 Dec 2010 14:16:09 +0000 (09:16 -0500)
commit	0358c9f9a43ce0ef33f7891ca9f9d67abd3b4853
tree	b1bcbf26cd9f6bf3769d35e04993828f4b0065d2	tree \| snapshot
parent	b70506bffba208daa2dc176be9370bc198ecd221	commit \| diff
parent	d085f61f25e9e208d99ca6e2c3547ba942033961	commit \| diff

Merge branch 'maint' into next

Conflicts:
e2fsck/pass4.c
misc/dumpe2fs.c
resize/online.c

e2fsck/e2fsck.h	diff1 \|	diff2 \|	blob \| history
e2fsck/journal.c	diff1 \|	diff2 \|	blob \| history
e2fsck/pass4.c	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	diff1 \|	diff2 \|	blob \| history
misc/dumpe2fs.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.conf.5.in	diff1 \|	diff2 \|	blob \| history
resize/online.c	diff1 \|	diff2 \|	blob \| history

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