Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Sun, 6 Jul 2014 04:09:27 +0000 (00:09 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 6 Jul 2014 04:09:27 +0000 (00:09 -0400)
commit7f7d1cb462789eef8e359caa46523ed6b99255e1
treee23923e05256deb1712ff21d4799312a0a6f1142
parent328731738d88eb6c32c784e7aa7871e576e9e8a5
parentcd75fb04510073004f8ef005e06733813faad2de
Merge branch 'maint' into next

Conflicts:
debugfs/set_fields.c
tests/f_mmp/script
tests/f_mmp_garbage/script
tests/m_mmp/script
tests/t_mmp_1on/script
tests/t_mmp_2off/script
32 files changed:
MCONFIG.in
configure
configure.in
debian/e2fslibs.symbols
debugfs/debugfs.c
debugfs/set_fields.c
e2fsck/Makefile.in
e2fsck/e2fsck.h
e2fsck/journal.c
e2fsck/message.c
e2fsck/problem.c
e2fsck/unix.c
e2fsck/util.c
lib/blkid/Makefile.in
lib/config.h.in
lib/e2p/Makefile.in
lib/et/Makefile.in
lib/ext2fs/Makefile.in
lib/ext2fs/alloc_tables.c
lib/ext2fs/closefs.c
lib/ext2fs/ext2fs.h
lib/ext2fs/initialize.c
lib/quota/Makefile.in
lib/ss/Makefile.in
lib/uuid/Makefile.in
misc/dumpe2fs.c
misc/e2image.c
misc/ext4.5.in
misc/mke2fs.c
misc/tune2fs.c
resize/resize2fs.c
util/subst.c