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: b874d24 e426e06)

author	Theodore Ts'o <tytso@mit.edu>
	Thu, 11 Sep 2014 16:40:43 +0000 (12:40 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 11 Sep 2014 16:40:43 +0000 (12:40 -0400)
commit	330cebc0e95aa8d81477a63932381bcc84eea3c1
tree	4cc8557bc47e7bbe35a66bce49b785c5f475c8f5	tree \| snapshot
parent	b874d24629aa132d74a96134ec8eae4773a3c0ce	commit \| diff
parent	e426e06afadd98a85fc668d78c8edea8c2501977	commit \| diff

Merge branch 'maint' into next

Conflicts:
debugfs/debugfs.c
e2fsck/Makefile.in
lib/ext2fs/Makefile.in
tests/test_config

MCONFIG.in	diff1 \|	diff2 \|	blob \| history
e2fsck/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ss/Makefile.in	diff1 \|	diff2 \|	blob \| history
resize/Makefile.in	diff1 \|	diff2 \|	blob \| history
tests/test_config	diff1 \|	diff2 \|	blob \| history

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