tree 481d09761cdc5bb63592afeefa904175336cc1ee
parent 126a031e437a4ab56a162e9cff7fc04b9f7efeec
parent c4caae25187ff3f5e837c6f04eb1acc2723c72d3
author Linus Torvalds <torvalds@linux-foundation.org> 1269551453 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1269551453 -0700

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: Fixed inode allocator to correctly track a flex_bg's used_dirs
  ext4: Don't use delayed allocation by default when used instead of ext3
  ext4: Fix spelling of CONTIG_FS_EXT3 to CONFIG_FS_EXT3
  ext4: Fix estimate of # of blocks needed to write indirect-mapped files