From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Mar 2010 21:10:53 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Tag: v2.6.34-rc3~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39f1cd635cbe8a42c3c74fa6bf9f61c1156bd27b;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'for_linus' of git://git./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
---

39f1cd635cbe8a42c3c74fa6bf9f61c1156bd27b