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: 7b68fa3 511ba98)

author	Theodore Ts'o <tytso@mit.edu>
	Tue, 22 Jan 2013 03:06:16 +0000 (22:06 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 22 Jan 2013 03:06:16 +0000 (22:06 -0500)
commit	fca8b1b2416c384b91b4fe00d6d37cfccb8fb3d5
tree	728a34057568a210f039c22890635dd6b83e82c7	tree \| snapshot
parent	7b68fa38b800fdbdfdad77273749f630b585f4c0	commit \| diff
parent	511ba985c0821d07a6274515e35cbf5a3c81077d	commit \| diff

Merge branch 'maint' into next

Conflicts:
RELEASE-NOTES
version.h

RELEASE-NOTES	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/gen_bitmap64.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	diff1 \|	diff2 \|	blob \| history
resize/resize2fs.c	diff1 \|	diff2 \|	blob \| history
version.h	diff1 \|	diff2 \|	blob \| history

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