Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Fri, 31 Jan 2014 00:05:16 +0000 (19:05 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 31 Jan 2014 00:05:16 +0000 (19:05 -0500)
commitf0996c12d5f189be2fddafc4b2665345230b3826
treecfca32b3d635ba43e233170b766877dffc0ac5a5
parentabbf95c739cfad7990a67ce73d01f4b6626cb5fc
parentc714d024826470a010dc3ff08300f52a9ab1556c
Merge branch 'maint' into next

Conflicts:
lib/ext2fs/alloc.c
misc/mke2fs.c
26 files changed:
configure.in
debugfs/set_fields.c
e2fsck/pass5.c
lib/config.h.in
lib/e2p/feature.c
lib/e2p/ls.c
lib/ext2fs/Makefile.in
lib/ext2fs/alloc.c
lib/ext2fs/alloc_stats.c
lib/ext2fs/alloc_tables.c
lib/ext2fs/blkmap64_ba.c
lib/ext2fs/blkmap64_rb.c
lib/ext2fs/bmap64.h
lib/ext2fs/closefs.c
lib/ext2fs/ext2_fs.h
lib/ext2fs/ext2fs.h
lib/ext2fs/extent.c
lib/ext2fs/gen_bitmap64.c
lib/ext2fs/initialize.c
lib/ext2fs/openfs.c
lib/ext2fs/rw_bitmaps.c
lib/ext2fs/swapfs.c
lib/ext2fs/tst_super_size.c
misc/mke2fs.c
misc/tune2fs.c
resize/resize2fs.c