From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jun 2008 22:30: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.26-rc6~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5f0e62c3e1db9acb35b750e02cddc1fcb8cfd52b;p=linux-2.6-omap-h63xx.git

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: enable barriers by default
  jbd2: Fix barrier fallback code to re-lock the buffer head
  ext4: Display the journal_async_commit mount option in /proc/mounts
  jbd2: If a journal checksum error is detected, propagate the error to ext4
  jbd2: Fix memory leak when verifying checksums in the journal
  ext4: fix online resize bug
  ext4: Fix uninit block group initialization with FLEX_BG
  ext4: Fix use of uninitialized data with debug enabled.
---

5f0e62c3e1db9acb35b750e02cddc1fcb8cfd52b