Merge branch 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block
Linus Torvalds [Wed, 25 May 2011 16:20:20 +0000 (09:20 -0700)]
* 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block:
  splice: add wakeup_pipe_readers()


Trivial merge