tree e94240a428f525c11c8758ebdd50398cec95e7be
parent 76db8ac45fc738f7d7664fe9b56d15c594a45228
parent e681c047e47c0abe67bf95857f23814372793cb0
author Linus Torvalds <torvalds@linux-foundation.org> 1290224805 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1290224805 -0800

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:
  ext4: Add EXT4_IOC_TRIM ioctl to handle batched discard
  fs: Do not dispatch FITRIM through separate super_operation
  ext4: ext4_fill_super shouldn't return 0 on corruption
  jbd2: fix /proc/fs/jbd2/<dev> when using an external journal
  ext4: missing unlock in ext4_clear_request_list()
  ext4: fix setting random pages PageUptodate