aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 18:24:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 18:24:35 -0400
commit811158b147a503fbdf9773224004ffd32002d1fe (patch)
tree0a11dcfefe721bfc38ea9f1f4a238822dbae0dda /Documentation/kernel-parameters.txt
parent4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (diff)
parentb26e0ed4936b743b693a4cc1413561fa3e4eaf65 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits) trivial: Update my email address trivial: NULL noise: drivers/mtd/tests/mtd_*test.c trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h trivial: Fix misspelling of "Celsius". trivial: remove unused variable 'path' in alloc_file() trivial: fix a pdlfush -> pdflush typo in comment trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL trivial: wusb: Storage class should be before const qualifier trivial: drivers/char/bsr.c: Storage class should be before const qualifier trivial: h8300: Storage class should be before const qualifier trivial: fix where cgroup documentation is not correctly referred to trivial: Give the right path in Documentation example trivial: MTD: remove EOL from MODULE_DESCRIPTION trivial: Fix typo in bio_split()'s documentation trivial: PWM: fix of #endif comment trivial: fix typos/grammar errors in Kconfig texts trivial: Fix misspelling of firmware trivial: cgroups: documentation typo and spelling corrections trivial: Update contact info for Jochen Hein trivial: fix typo "resgister" -> "register" ...
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index bdc0c433e88c..421920897a37 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1605,7 +1605,7 @@ and is between 256 and 4096 characters. It is defined in the file
1605 nosoftlockup [KNL] Disable the soft-lockup detector. 1605 nosoftlockup [KNL] Disable the soft-lockup detector.
1606 1606
1607 noswapaccount [KNL] Disable accounting of swap in memory resource 1607 noswapaccount [KNL] Disable accounting of swap in memory resource
1608 controller. (See Documentation/controllers/memory.txt) 1608 controller. (See Documentation/cgroups/memory.txt)
1609 1609
1610 nosync [HW,M68K] Disables sync negotiation for all devices. 1610 nosync [HW,M68K] Disables sync negotiation for all devices.
1611 1611
@@ -1955,7 +1955,7 @@ and is between 256 and 4096 characters. It is defined in the file
1955 1955
1956 relax_domain_level= 1956 relax_domain_level=
1957 [KNL, SMP] Set scheduler's default relax_domain_level. 1957 [KNL, SMP] Set scheduler's default relax_domain_level.
1958 See Documentation/cpusets.txt. 1958 See Documentation/cgroups/cpusets.txt.
1959 1959
1960 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area 1960 reserve= [KNL,BUGS] Force the kernel to ignore some iomem area
1961 1961