| commit | 39f1cd635cbe8a42c3c74fa6bf9f61c1156bd27b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 25 14:10:53 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 25 14:10:53 2010 -0700 |
| tree | 481d09761cdc5bb63592afeefa904175336cc1ee | |
| parent | 126a031e437a4ab56a162e9cff7fc04b9f7efeec [diff] | |
| parent | c4caae25187ff3f5e837c6f04eb1acc2723c72d3 [diff] |
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