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: 2b24aad 4727c67)

author	Theodore Ts'o <tytso@mit.edu>
	Mon, 16 Dec 2013 06:35:56 +0000 (01:35 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 16 Dec 2013 06:35:56 +0000 (01:35 -0500)
commit	e4681bca170094430ef173b67345d2d8f0cfcea8
tree	c181113d4e11701dae5daa53f943cfa517aeab46	tree \| snapshot
parent	2b24aadee872b8200729db479a6418a9d7f83794	commit \| diff
parent	4727c67dc20f0c15cc8502b9bc3ee9f73d7e2c3a	commit \| diff

Merge branch 'maint' into next

Conflicts:
debugfs/debugfs.8.in

18 files changed:

configure	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.8.in	diff1 \|	diff2 \|	blob \| history
e2fsck/journal.c	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1b.c	diff1 \|	diff2 \|	blob \| history
e2fsck/pass3.c	diff1 \|	diff2 \|	blob \| history
e2fsck/pass5.c	diff1 \|	diff2 \|	blob \| history
e2fsck/rehash.c	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	diff1 \|	diff2 \|	blob \| history
e2fsck/util.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/expanddir.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2fsP.h	diff1 \|	diff2 \|	blob \| history
misc/dumpe2fs.c	diff1 \|	diff2 \|	blob \| history
misc/e2image.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

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