| commit | 5212c555be332fc95982077e6cdc7bb6cb5fff5f | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Mon, 11 Jun 2007 18:31:05 +0000 (11 11:31 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Mon, 11 Jun 2007 18:31:05 +0000 (11 11:31 -0700) | ||
| tree | 44907e3427949462dcc54ae762cc49ae8e9571f0 | treesnapshot (tar.gz zip) |
| parent | 845a2fdcbd5bc5b9f652201ee95c825827a1d521 | commitdiff |
| parent | 620a324b744a7d66c3c45a83042f8e7fc9fc5a04 | commitdiff |
Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block
* 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block:
splice: __generic_file_splice_read: fix read/truncate race
splice: __generic_file_splice_read: fix i_size_read() length checks
splice: move balance_dirty_pages_ratelimited() outside of splice actor
pipe: move pipe_inode_info structure decleration up before it's used
splice: remove do_splice_direct() symbol export
splice: move inode size check into generic_file_splice_read()
* 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block:
splice: __generic_file_splice_read: fix read/truncate race
splice: __generic_file_splice_read: fix i_size_read() length checks
splice: move balance_dirty_pages_ratelimited() outside of splice actor
pipe: move pipe_inode_info structure decleration up before it's used
splice: remove do_splice_direct() symbol export
splice: move inode size check into generic_file_splice_read()