tree 7b47b66949b4f93eb2bf1f00c8adfec7f0d4d719
parent c8237a5fcea9d49a73275b4c8f541dd42f8da1a4
parent 5eb7f9fa847b8ab6e4864bfb8cb45f370844a47c
author Linus Torvalds <torvalds@linux-foundation.org> 1206556044 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1206556044 -0700

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)