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: f142097 0c7be6c)

author	Theodore Ts'o <tytso@mit.edu>
	Wed, 18 Jun 2008 03:54:51 +0000 (23:54 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Wed, 18 Jun 2008 03:54:51 +0000 (23:54 -0400)
commit	71ff129e9f5c942ce4d2eb20e269100d15c1a6ae
tree	422b5c6bdf5fdbe06389a0153ff668995a54a11d	tree \| snapshot
parent	f1420977d47c0e1e679c4a7c3f0cf1a5f0caca4a	commit \| diff
parent	0c7be6cb7becba98bdcedb6eb999548667ad7b6e	commit \| diff

Merge branch 'maint'

Conflicts:

README
resize/online.c
version.h

debugfs/debugfs.8.in	diff1 \|	diff2 \|	blob \| history
doc/libext2fs.texinfo	diff1 \|	diff2 \|	blob \| history
lib/blkid/probe.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	diff1 \|	diff2 \|	blob \| history
resize/online.c	diff1 \|	diff2 \|	blob \| history
resize/resize2fs.c	diff1 \|	diff2 \|	blob \| history
tests/r_move_itable/expect	diff1 \|	diff2 \|	blob \| history
tests/r_resize_inode/expect	diff1 \|	diff2 \|	blob \| history

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