]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Nov 2010 03:46:45 +0000 (19:46 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Nov 2010 03:46:45 +0000 (19:46 -0800)
commit1fa3f01d4060cdf5893bac8f0571d9222ba596ab
treee94240a428f525c11c8758ebdd50398cec95e7be
parent6ee1a30bad93a94a751223324478a7df3c9713ad
parentcc959d82ef7553d1189067bf807aca960a474f85
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
fs/ioctl.c