tree 3bef22735e85c680c8049b2145ecbeb332f3f59b
parent df3256f9ab7ae2127144de5ba2abca332278a42d
parent c2b67735e5d3a419e90047b3f4179e54a39637bc
author Linus Torvalds <torvalds@linux-foundation.org> 1306275106 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306275106 -0700

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  jbd: Fix comment to match the code in journal_start()
  jbd/jbd2: remove obsolete summarise_journal_usage.
  jbd: Fix forever sleeping process in do_get_write_access()
  ext2: fix error msg when mounting fs with too-large blocksize
  jbd: fix fsync() tid wraparound bug
  ext3: Fix fs corruption when make_indexed_dir() fails
  ext3: Fix lock inversion in ext3_symlink()