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: 7f7d1cb de25d9c)

author	Theodore Ts'o <tytso@mit.edu>
	Thu, 10 Jul 2014 05:07:39 +0000 (01:07 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 10 Jul 2014 05:07:39 +0000 (01:07 -0400)
commit	f10554e1c2a40299586bb3bc8ba15edb5bb9cf40
tree	f1235f53a48ceacbd4ce9b9807233b1aac573029	tree \| snapshot
parent	7f7d1cb462789eef8e359caa46523ed6b99255e1	commit \| diff
parent	de25d9c8c48c7474828e9452184e204b18b8e090	commit \| diff

Merge remote-tracking branch 'origin/maint' into next

Conflicts:
RELEASE-NOTES
debian/changelog
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
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