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: 048786d 695706c)

author	Theodore Ts'o <tytso@mit.edu>
	Mon, 5 Oct 2009 00:40:46 +0000 (20:40 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 5 Oct 2009 00:40:46 +0000 (20:40 -0400)
commit	95bcea9fc149e349865f9eb30988ad1b4e1c1342
tree	94c66672b4ac19fbcc97e9c7ea5d13f8d6c2c44e	tree \| snapshot
parent	048786d7e87a6de698936b0cf25f1ab70d5c15bc	commit \| diff
parent	695706ca214d9d04666ee46a48f63f6127154a23	commit \| diff

Merge branch 'maint' into next

Conflicts:
configure
configure.in
misc/mke2fs.c

18 files changed:

configure	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.c	diff1 \|	diff2 \|	blob \| history
e2fsck/message.c	diff1 \|	diff2 \|	blob \| history
e2fsck/super.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/tst_badblocks.c	diff1 \|	diff2 \|	blob \| history
misc/Makefile.in	diff1 \|	diff2 \|	blob \| history
misc/e2undo.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
tests/f_resize_inode/expect	diff1 \|	diff2 \|	blob \| history
tests/m_dasd_bs/expect.1	diff1 \|	diff2 \|	blob \| history
tests/m_large_file/expect.1	diff1 \|	diff2 \|	blob \| history
tests/m_meta_bg/expect.1	diff1 \|	diff2 \|	blob \| history
tests/m_no_opt/expect.1	diff1 \|	diff2 \|	blob \| history
tests/m_raid_opt/expect.1	diff1 \|	diff2 \|	blob \| history
tests/m_std/expect.1	diff1 \|	diff2 \|	blob \| history
tests/m_uninit/expect.1	diff1 \|	diff2 \|	blob \| history

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