From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Jan 2010 20:31:52 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Tag: v2.6.33-rc3~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e43c259777999d19532cf418ca69ce1288b42edc;p=linux-block.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: Calculate metadata requirements more accurately
  ext4: Fix accounting of reserved metadata blocks
---

e43c259777999d19532cf418ca69ce1288b42edc