Skip to content
Commit c88bc60a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block:
  splice: add wakeup_pipe_readers()
parents 929cfdd5 825cdcb1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment