summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 09:20:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 09:20:20 -0700
commitc88bc60a3bd3c63da3960076f13a4606c76bf013 (patch)
treefcfddbb9d1a63af5c821d8711719935a57009a1a /net
parent929cfdd5d3bdc772aff32e5a3fb4e3894394aa75 (diff)
parent825cdcb1a5aaaefd884f302b4a3a9efb672c89c1 (diff)
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()
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions