Merge branch 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2011 16:20:20 +0000 (09:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2011 16:20:20 +0000 (09:20 -0700)
commitc88bc60a3bd3c63da3960076f13a4606c76bf013
treefcfddbb9d1a63af5c821d8711719935a57009a1a
parent929cfdd5d3bdc772aff32e5a3fb4e3894394aa75
parent825cdcb1a5aaaefd884f302b4a3a9efb672c89c1
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()