git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 20 Nov 2010 03:46:45 +0000 (19:46 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Sat, 20 Nov 2010 03:46:45 +0000 (19:46 -0800)

* '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

		1	2
fs/ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge