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: daf57ea ab3f5c5)

author	Theodore Ts'o <tytso@mit.edu>
	Mon, 10 Sep 2012 02:52:26 +0000 (22:52 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 10 Sep 2012 02:52:26 +0000 (22:52 -0400)
commit	0e7e7c8ef89cf32fdb1210bfde1feb90880c327b
tree	50d2ccb9353696ae1153e6fe324a874e5d5757d8	tree \| snapshot
parent	daf57eaaae5eeef849d5dae4bbf3bf8687ca2c08	commit \| diff
parent	ab3f5c5aad6310be1d1891c05f1bc8cf7ccf0cef	commit \| diff

Merge branch 'maint' into next

Conflicts:
lib/ext2fs/ext2fs.h

configure	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
e2fsck/jfs_user.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/initialize.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/kernel-jbd.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/tst_super_size.c	diff1 \|	diff2 \|	blob \| history

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