tree 5c77a5397d01c91aaa59ee5517af28afee32afcb
parent c7a3bd177f248d01ee18a01d22048c80e071c331
parent 8c34e2d63231d4bf4852bac8521883944d770fe3
author Linus Torvalds <torvalds@g5.osdl.org> 1161450112 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1161450112 -0700

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