Merge branch 'maint'

diff --cc Makefile.in
Simple merge

diff --cc debian/rules
Simple merge

diff --cc debugfs/debugfs.8.in
Simple merge

diff --cc doc/libext2fs.texinfo
Simple merge

diff --cc e2fsck/Makefile.in
Simple merge

diff --cc misc/mke2fs.c
Simple merge

diff --cc misc/tune2fs.c
index fae5875b1d0682f70c30ac47ee7f6c159fb6edb8,4f66d42b0229116ba4f0398bed48882c0e1921bf..dc44d5668731ee4180b93e485ef3a07b4592dd1e
--- 1/misc/tune2fs.c
--- 2/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@@ -126,11 -125,9 +127,10 @@@ static __u32 clear_ok_features[3] = 
                EXT2_FEATURE_COMPAT_RESIZE_INODE |
                EXT2_FEATURE_COMPAT_DIR_INDEX,
        /* Incompat */
 -      EXT2_FEATURE_INCOMPAT_FILETYPE,
 +      EXT2_FEATURE_INCOMPAT_FILETYPE |
 +              EXT4_FEATURE_INCOMPAT_FLEX_BG,
        /* R/O compat */
-       EXT2_FEATURE_RO_COMPAT_LARGE_FILE |
-               EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER
+       EXT2_FEATURE_RO_COMPAT_LARGE_FILE
  };
  
  /*

diff --cc resize/resize2fs.c
Simple merge