From 1ea4aa65da89409b92c9d3a3eec97a873c6e0d0e Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 12 May 2009 11:11:48 +0200
Subject: [PATCH] --- yaml --- r: 147037 b: refs/heads/master c:
 2b1ccc0ee918a653d0483fdad9dd6112ce8e9043 h: refs/heads/master i:   147035:
 b95025fde55a87bb2f6d2a8e1d0e3e735349673e v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/splice.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4842f8b3e9ea..957b5bde6b7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e458824f9d32e9bf7700d1eb0d201749af48eee0
+refs/heads/master: 2b1ccc0ee918a653d0483fdad9dd6112ce8e9043
diff --git a/trunk/include/linux/splice.h b/trunk/include/linux/splice.h
index 5f3faa9d15ae..18e7c7c0cae6 100644
--- a/trunk/include/linux/splice.h
+++ b/trunk/include/linux/splice.h
@@ -11,8 +11,7 @@
 #include <linux/pipe_fs_i.h>
 
 /*
- * splice is tied to pipes as a transport (at least for now), so we'll just
- * add the splice flags here.
+ * Flags passed in from splice/tee/vmsplice
  */
 #define SPLICE_F_MOVE	(0x01)	/* move pages instead of copying */
 #define SPLICE_F_NONBLOCK (0x02) /* don't block on the pipe splicing (but */