Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:31:52 +0000 (12:31 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Jan 2010 20:31:52 +0000 (12:31 -0800)
commite43c259777999d19532cf418ca69ce1288b42edc
treed8fa5de63560d13917df4843f70a73189f77a33d
parent3e8d95d95eaf4b332f6e1862ffbaa80c24780767
parent9d0be50230b333005635967f7ecd4897dbfd181b
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