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: e6bbc00 4f9abdc)

author	Theodore Ts'o <tytso@mit.edu>
	Wed, 27 Feb 2008 23:53:34 +0000 (18:53 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Wed, 27 Feb 2008 23:53:34 +0000 (18:53 -0500)
commit	a49670e64e28ac3b15e36cb6bd0a8135d3ecdbbb
tree	30f0ecd00942e15e097ca2c253131f4d3abce3a9	tree \| snapshot
parent	e6bbc002c5a3d30df156d4f23bc93a7f2dbde3a1	commit \| diff
parent	4f9abdcb306ff515a8009a1e0fd35041688133c9	commit \| diff

Merge branch 'maint'

Conflicts:

lib/blkid/devname.c
lib/blkid/probe.c
misc/mke2fs.c
misc/tune2fs.c

12 files changed:

debugfs/debugfs.c	diff1 \|	diff2 \|	blob \| history
e2fsck/Makefile.in	diff1 \|	diff2 \|	blob \| history
e2fsck/e2fsck.8.in	diff1 \|	diff2 \|	blob \| history
e2fsck/pass2.c	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	diff1 \|	diff2 \|	blob \| history
lib/blkid/probe.c	diff1 \|	diff2 \|	blob \| history
lib/e2p/feature.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/openfs.c	diff1 \|	diff2 \|	blob \| history
misc/dumpe2fs.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	diff1 \|	diff2 \|	blob \| history

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