tree d4247c8ee6b7371e60dcadaf1540c943ed7a9801
parent 179198373cf374f0ef793f1023c1cdd83b53674d
parent 0c755de03e69619c768867d89e6d827d3afa13d9
author Linus Torvalds <torvalds@linux-foundation.org> 1300408879 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300408879 -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:
  ext3: Always set dx_node's fake_dirent explicitly.
  ext3: Fix an overflow in ext3_trim_fs.
  jbd: Remove one to many n's in a word.
  ext3: skip orphan cleanup on rocompat fs
  ext2: Fix link count corruption under heavy link+rename load
  ext3: speed up group trim with the right free block count.
  ext3: Adjust trim start with first_data_block.
  quota: return -ENOMEM when memory allocation fails