From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Nov 2010 03:46:45 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Tag: v2.6.37-rc3~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b86db4744230c94e480de56f1b7f31117edbf193;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for_linus' of git://git./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
---

b86db4744230c94e480de56f1b7f31117edbf193