summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-09 14:03:15 +0300
committerIngo Molnar <mingo@kernel.org>2016-02-09 14:03:15 +0300
commit3aa6b46c6d6d0f89395ec3811a77fe22e57fa0d3 (patch)
tree12f0563b9b4915ad1b43488df21709dfac287f37 /lib
parent975db45e9cc561bf8a7eddfa0705d3a078ec184f (diff)
parent8a5fd56431fe1682e870bd6ab0c276e74befbeb9 (diff)
downloadlinux-3aa6b46c6d6d0f89395ec3811a77fe22e57fa0d3.tar.xz
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/scatterlist.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index bafa9933fa76..004fc70fc56a 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -598,9 +598,9 @@ EXPORT_SYMBOL(sg_miter_next);
*
* Description:
* Stops mapping iterator @miter. @miter should have been started
- * started using sg_miter_start(). A stopped iteration can be
- * resumed by calling sg_miter_next() on it. This is useful when
- * resources (kmap) need to be released during iteration.
+ * using sg_miter_start(). A stopped iteration can be resumed by
+ * calling sg_miter_next() on it. This is useful when resources (kmap)
+ * need to be released during iteration.
*
* Context:
* Preemption disabled if the SG_MITER_ATOMIC is set. Don't care