path: root/Documentation
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-23 09:52:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-23 09:52:32 -0700
commit3db0d4defc36fd9ea4d8e09170d4584d41024cd6 (patch)
tree78ee6d6839fce9c0065eeb996a95cc531b74200a /Documentation
parent6a7492a4b2e05051a44458d7187023e22d580666 (diff)
parentee8a99bdb47f32327bdfaffe35b900ca7161ba4e (diff)
Merge branch 'akpm' (patches from Andrew Morton)
Merge fixes from Andrew Morton: "A few fixes. One is a licensing change and I don't do licensing, so please eyeball that one" Licensing eye-balled. * emailed patches from Andrew Morton <akpm@linux-foundation.org>: lib/lz4: correct the LZ4 license memcg: get rid of swapaccount leftovers nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection nilfs2: remove double bio_put() in nilfs_end_bio_write() for BIO_EOPNOTSUPP error drivers/platform/olpc/olpc-ec.c: initialise earlier
Diffstat (limited to 'Documentation')
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)