From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 25 May 2011 16:20:20 +0000 (-0700)
Subject: Merge branch 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v3.0-rc1~161
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c88bc60a3bd3c63da3960076f13a4606c76bf013;p=linux.git

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()
---

c88bc60a3bd3c63da3960076f13a4606c76bf013