Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Mar 2008 18:27:24 +0000 (11:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Mar 2008 18:27:24 +0000 (11:27 -0700)
commit729eb528c7e10a4828fece102872ec5255946f64
tree7b47b66949b4f93eb2bf1f00c8adfec7f0d4d719
parentc8237a5fcea9d49a73275b4c8f541dd42f8da1a4
parent5eb7f9fa847b8ab6e4864bfb8cb45f370844a47c
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  relay: set an spd_release() hook for splice
  set relay file can not be read by pread(2)