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: df5e35f 8359f62)

author	Theodore Ts'o <tytso@mit.edu>
	Wed, 16 Jan 2013 19:14:09 +0000 (14:14 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Wed, 16 Jan 2013 19:14:09 +0000 (14:14 -0500)
commit	7b68fa38b800fdbdfdad77273749f630b585f4c0
tree	dc633497571a285fa4afd3ed2d23781f38c57b56	tree \| snapshot
parent	df5e35fd63b42b66d5025fdca17bfdf6662a2827	commit \| diff
parent	8359f626a4e94757312f68759366f06c9ad4c1ac	commit \| diff

Merge branch 'maint' into next

Conflicts:
RELEASE-NOTES
lib/ext2fs/ext2_err.et.in
version.h

RELEASE-NOTES	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/e2fslibs.symbols	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.8.in	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/initialize.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
version.h	diff1 \|	diff2 \|	blob \| history

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