Merge branch 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block