tree 44907e3427949462dcc54ae762cc49ae8e9571f0
parent 845a2fdcbd5bc5b9f652201ee95c825827a1d521
parent 620a324b744a7d66c3c45a83042f8e7fc9fc5a04
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1181586665 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1181586665 -0700

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()