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: 71715a5 4cf0b0f)

author	Theodore Ts'o <tytso@mit.edu>
	Sun, 11 May 2014 22:30:11 +0000 (18:30 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Sun, 11 May 2014 22:30:11 +0000 (18:30 -0400)
commit	c9bc7484cc79f486f6cf4a36a5d936e545f99f3d
tree	ef747fb832cf38fc081f61fe68c9fe443458e8c8	tree \| snapshot
parent	71715a5a9ad409df162dbb58a4c3b6fd2c5868d5	commit \| diff
parent	4cf0b0fe443566940098308c2a9eb28fdb000166	commit \| diff

Merge branch 'maint' into next

Conflicts:
e2fsck/pass1.c

19 files changed:

MCONFIG.in	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
e2fsck/e2fsck.h	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1.c	diff1 \|	diff2 \|	blob \| history
e2fsck/problem.c	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	diff1 \|	diff2 \|	blob \| history
lib/blkid/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/config.h.in	diff1 \|	diff2 \|	blob \| history
lib/e2p/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/et/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/alloc_tables.c	diff1 \|	diff2 \|	blob \| history
lib/quota/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ss/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/uuid/Makefile.in	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