diff options
| author | Ingo Molnar | 2016-02-09 12:03:15 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2016-02-09 12:03:15 +0100 |
| commit | 3aa6b46c6d6d0f89395ec3811a77fe22e57fa0d3 (patch) | |
| tree | 12f0563b9b4915ad1b43488df21709dfac287f37 /lib | |
| parent | locking/static_keys: Avoid nested functions (diff) | |
| parent | locking/lockdep: Fix stack trace caching logic (diff) | |
| download | kernel-qcow2-linux-3aa6b46c6d6d0f89395ec3811a77fe22e57fa0d3.tar.gz kernel-qcow2-linux-3aa6b46c6d6d0f89395ec3811a77fe22e57fa0d3.tar.xz kernel-qcow2-linux-3aa6b46c6d6d0f89395ec3811a77fe22e57fa0d3.zip | |
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.c | 6 |
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 |