From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 4 May 2006 17:25:40 +0000 (-0400)
Subject: Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.17-rc4~44
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cbdf811c77cf2906a099b8da92e9f6f335b68a73;p=linux-2.6-omap-h63xx.git

Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] compat_sys_vmsplice: one-off in UIO_MAXIOV check
  [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST
  [PATCH] splice: rename remaining info variables to pipe
  [PATCH] splice: LRU fixups
  [PATCH] splice: fix unlocking of page on error ->prepare_write()
---

cbdf811c77cf2906a099b8da92e9f6f335b68a73