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: 70f4632 6e2393f)

author	Theodore Ts'o <tytso@mit.edu>
	Sun, 16 Jun 2013 22:54:01 +0000 (18:54 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Sun, 16 Jun 2013 22:54:01 +0000 (18:54 -0400)
commit	8b9eb12807786f67f8be99da43c878743b8a6917
tree	a8d66b9cff1cb8a8ef4bdd33ee7ca16a61e1bb8a	tree \| snapshot
parent	70f4632b626e3db94dd02c9dc9b4e643ffb0d048	commit \| diff
parent	6e2393fde2552a8c6449639a733e8ae4e095b113	commit \| diff

Merge branch 'maint' into next

Conflicts:
RELEASE-NOTES
e2fsck/Makefile.in
lib/config.h.in
version.h

RELEASE-NOTES	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
e2fsck/Makefile.in	diff1 \|	diff2 \|	blob \| history
e2fsck/sigcatcher.c	diff1 \|	diff2 \|	blob \| history
lib/config.h.in	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/closefs.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2fs.h	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