projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f1b2a5a f319fb8)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Oct 2008 23:10:29 +0000 (16:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Oct 2008 23:10:29 +0000 (16:10 -0700)
commit3280fb313911a80b13de52d9fe37f39668f2138e
tree6903a275ab00172a88cf51ab1d570e4a3e1a286btree | snapshot
parentf1b2a5ace996de339292d4035f9f5b294aecd11ecommit | diff
parentf319fb8bf6899e08bdb8d1e09a4e7a129dfa2312commit | diff
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
John Crispins staging tree