]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jul 2009 19:12:10 +0000 (12:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jul 2009 19:12:10 +0000 (12:12 -0700)
commit2bc20d09b03bca6e068e07440812d75b70b1c0b2
tree50711d4320e12efd1439639af8464b69a3b7af6a
parentc7425eb4814bce40f3d117ff7a7870cc12e350e3
parentf1015c447781729060c415f5133164c638561f25
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 race between write_metadata_buffer and get_write_access
  ext3: Get rid of extenddisksize parameter of ext3_get_blocks_handle()
  jbd: Fix a race between checkpointing code and journal_get_write_access()
  ext3: Fix truncation of symlinks after failed write
  jbd: Fail to load a journal if it is too short