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: efe0b40 58384b8)

author	Theodore Ts'o <tytso@mit.edu>
	Mon, 19 Jul 2010 06:37:41 +0000 (02:37 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 19 Jul 2010 06:37:41 +0000 (02:37 -0400)
commit	db0bdb49f49fc3dd14c12439d934a3403a3be9f1
tree	ebbdc877184df5896a89d291193029d730aadd85	tree \| snapshot
parent	efe0b401465a3ee836180614b5b435acbb84fc27	commit \| diff
parent	58384b8fa81ce01221414a3603591b63e487609b	commit \| diff

Merge branch 'maint' into next

Conflicts:
resize/extent.c

debugfs/set_fields.c	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	diff1 \|	diff2 \|	blob \| history
lib/e2p/ls.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2_fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/swapfs.c	diff1 \|	diff2 \|	blob \| history
misc/e2freefrag.c	diff1 \|	diff2 \|	blob \| history
resize/extent.c	diff1 \|	diff2 \|	blob \| history
resize/main.c	diff1 \|	diff2 \|	blob \| history

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