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


Trivial merge