From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 21 Oct 2006 17:01:52 +0000 (-0700)
Subject: Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.19-rc3~32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b7fc708b568a258595e1fa911b930a75ac07b48;p=linux-2.6

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] Remove SUID when splicing into an inode
  [PATCH] Add lockless helpers for remove_suid()
  [PATCH] Introduce generic_file_splice_write_nolock()
  [PATCH] Take i_mutex in splice_from_pipe()
---

7b7fc708b568a258595e1fa911b930a75ac07b48