summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-30 12:04:14 +0200
committerMark Brown <broonie@linaro.org>2013-08-30 12:04:14 +0200
commitc79c33af8f867e57ad4b84102db7901aee67485a (patch)
treeaa619736b89a143cfc48f9647493c929523a928a /Documentation
parentALSA: hda - Simplify CONFIG_SND_HDA_I915 condition (diff)
parentASoC: Pass card instead of dapm context to snd_soc_dapm_new_widgets() (diff)
downloadlinux-c79c33af8f867e57ad4b84102db7901aee67485a.tar.xz
linux-c79c33af8f867e57ad4b84102db7901aee67485a.zip
Merge remote-tracking branch 'asoc/topic/core' into tmp
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 15356aca938c..7f9d4f53882c 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2953,7 +2953,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
improve throughput, but will also increase the
amount of memory reserved for use by the client.
- swapaccount[=0|1]
+ swapaccount=[0|1]
[KNL] Enable accounting of swap in memory resource
controller if no parameter or 1 is given or disable
it if 0 is given (See Documentation/cgroups/memory.txt)