From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Oct 2008 23:10:29 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Tag: v2.6.28-rc1~696
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=3280fb313911a80b13de52d9fe37f39668f2138e;p=safe%2Fjmp%2Flinux-2.6

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: fix kconfig typo and extra whitespace
  ext4: fix build failure without procfs
  ext4: add an option to control error handling on file data
  jbd2: don't dirty original metadata buffer on abort
  ext4: add checks for errors from jbd2
  jbd2: fix error handling for checkpoint io
  jbd2: abort when failed to log metadata buffers
---

3280fb313911a80b13de52d9fe37f39668f2138e