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: d2dce12 5a1d25a)

author	Theodore Ts'o <tytso@mit.edu>
	Thu, 9 Jan 2014 17:25:37 +0000 (12:25 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 9 Jan 2014 17:25:37 +0000 (12:25 -0500)
commit	bc82f39437922f50d5f2846656458e50d65d2dc4
tree	be7f3e5b8b833d0320c3edbf3b17ff69f18bcc53	tree \| snapshot
parent	d2dce124dd47447cb0849b49feb499f02250826e	commit \| diff
parent	5a1d25a7b2a718cdd4553d853584098e128c5b91	commit \| diff

Merge branch 'maint' into next

Conflicts:
e2fsck/pass1.c
lib/ext2fs/csum.c

debugfs/debugfs.c	diff1 \|	diff2 \|	blob \| history
e2fsck/message.c	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/blkmap64_rb.c	diff1 \|	diff2 \|	blob \| history

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