git://git.whamcloud.com - tools/e2fsprogs.git/commit

Whamcloud - gitweb

git://git.whamcloud.com / tools / e2fsprogs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b689b8d 7132d48)

author	Theodore Ts'o <tytso@mit.edu>
	Tue, 1 Jan 2008 17:41:35 +0000 (12:41 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 1 Jan 2008 17:41:35 +0000 (12:41 -0500)
commit	fef2b38d8e5b475655771f8208265a8fa9246601
tree	b56a98ef4067cdaa7bc9e1cf502ab0352cf9b851	tree \| snapshot
parent	b689b8dd14e69c652d2c8211bdef3effe81cfd65	commit \| diff
parent	7132d48d83f79992773b6d9f1cace8d96366f08b	commit \| diff

Merge branch 'maint' into next

Conflicts:

configure
debian/rules
e2fsck/swapfs.c
lib/ext2fs/ext2_fs.h

13 files changed:

configure	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.c	diff1 \|	diff2 \|	blob \| history
debugfs/set_fields.c	diff1 \|	diff2 \|	blob \| history
doc/libext2fs.texinfo	diff1 \|	diff2 \|	blob \| history
e2fsck/e2fsck.8.in	diff1 \|	diff2 \|	blob \| history
e2fsck/rehash.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2_fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2fs.h	diff1 \|	diff2 \|	blob \| history
misc/Makefile.in	diff1 \|	diff2 \|	blob \| history
misc/e2image.c	diff1 \|	diff2 \|	blob \| history
resize/resize2fs.c	diff1 \|	diff2 \|	blob \| history

Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git