---

yaml --- r: 376270 b: refs/heads/master c: 6900807 h: refs/heads/master v: v3
git-mirror · May 24, 2013 · 07a5a5b · 07a5a5b
1 parent a995d7a
commit 07a5a5b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97c9266b11967e6401866b0111af59fa894180bf
+refs/heads/master: 6900807c6b95dcb004902302b8ac5dbfbf6feb89
diff --git a/trunk/fs/aio.c b/trunk/fs/aio.c
@@ -1299,8 +1299,7 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
  *	< min_nr if the timeout specified by timeout has elapsed
  *	before sufficient events are available, where timeout == NULL
  *	specifies an infinite timeout. Note that the timeout pointed to by
- *	timeout is relative and will be updated if not NULL and the
- *	operation blocks. Will fail with -ENOSYS if not implemented.
+ *	timeout is relative.  Will fail with -ENOSYS if not implemented.
  */
 SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
 		long, min_nr,