tree 2c0b507ed89a97116cc595e090ebaeb1439df865
parent aab2545fdd6641b76af0ae96456c4ca9d1e50dad
parent 571640cad3fda6475da45d91cf86076f1f86bd9b
author Linus Torvalds <torvalds@linux-foundation.org> 1212791453 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1212791453 -0700

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.