tree 01396fd1e40cedd9cd6b336c27e3f6885af36bc2
parent f73aaf10ae14ee8f9644b0f7abe252fe7eeb17f5
parent a996031c87e093017c0763326a08896a3a4817f4
author Linus Torvalds <torvalds@linux-foundation.org> 1225464732 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1225464732 -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:
  delay capable() check in ext4_has_free_blocks()
  merge ext4_claim_free_blocks & ext4_has_free_blocks
  jbd2: Call the commit callback before the transaction could get dropped
  ext4: fix a bug accessing freed memory in ext4_abort
  ext3: fix a bug accessing freed memory in ext3_abort