diff --git a/[refs] b/[refs] index 9ee55923a4f6..9adb64bfba89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49570e9b29a3d78950b5eba6b73bdcca955f0877 +refs/heads/master: c2058e0611c2fb4a00e63db61ef3a638cf760a98 diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index 77b026baff7d..48b4382cc114 100644 --- a/trunk/fs/splice.c +++ b/trunk/fs/splice.c @@ -9,11 +9,12 @@ * that transfers data buffers to or from a pipe buffer. * * Named by Larry McVoy, original implementation from Linus, extended by - * Jens to support splicing to files and fixing the initial implementation - * bugs. + * Jens to support splicing to files, network, direct splicing, etc and + * fixing lots of bugs. * - * Copyright (C) 2005 Jens Axboe - * Copyright (C) 2005 Linus Torvalds + * Copyright (C) 2005-2006 Jens Axboe + * Copyright (C) 2005-2006 Linus Torvalds + * Copyright (C) 2006 Ingo Molnar * */ #include