summaryrefslogtreecommitdiffstats
path: root/Documentation/md.txt
diff options
context:
space:
mode:
authorTony Lindgren2015-07-06 14:33:17 +0200
committerTony Lindgren2015-07-06 14:33:17 +0200
commitae745302c0a3e2b5b768690f631fc14db44467e7 (patch)
tree1db4d210a7419286b447dc09fa7400a561d55f42 /Documentation/md.txt
parentARM: OMAP2+: Remove unnessary return statement from the void function, omap2_... (diff)
parentARM: dts: am4372.dtsi: disable rfbi (diff)
downloadkernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.gz
kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.tar.xz
kernel-qcow2-linux-ae745302c0a3e2b5b768690f631fc14db44467e7.zip
Merge branch 'fixes-rc1' into omap-for-v4.2/fixes
Diffstat (limited to 'Documentation/md.txt')
-rw-r--r--Documentation/md.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/md.txt b/Documentation/md.txt
index f925666e4342..1a2ada46aaed 100644
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
@@ -549,7 +549,7 @@ also have
sync_speed_max
This are similar to /proc/sys/dev/raid/speed_limit_{min,max}
however they only apply to the particular array.
- If no value has been written to these, of if the word 'system'
+ If no value has been written to these, or if the word 'system'
is written, then the system-wide value is used. If a value,
in kibibytes-per-second is written, then it is used.
When the files are read, they show the currently active value