aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-14 16:46:25 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-14 16:46:25 -0400
commit489f7ab6c18cdd64a2d444e056d60a0e722f4ad7 (patch)
tree2c7ed6a0042dc15c91ece08c5a3866f610ddca6d /Documentation/kernel-parameters.txt
parentb322b7816908487c08b89b72f838174c37d8c836 (diff)
parent82d27b2b2f3a80ffa7759a49b9cba39e47df476e (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: (31 commits) trivial: remove the trivial patch monkey's name from SubmittingPatches trivial: Fix a typo in comment of addrconf_dad_start() trivial: usb: fix missing space typo in doc trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug trivial: Remove the hyphen from git commands trivial: fix ETIMEOUT -> ETIMEDOUT typos trivial: Kconfig: .ko is normally not included in module names trivial: SubmittingPatches: fix typo trivial: Documentation/dell_rbu.txt: fix typos trivial: Fix Pavel's address in MAINTAINERS trivial: ftrace:fix description of trace directory trivial: unnecessary (void*) cast removal in sound/oss/msnd.c trivial: input/misc: Fix typo in Kconfig trivial: fix grammo in bus_for_each_dev() kerneldoc trivial: rbtree.txt: fix rb_entry() parameters in sample code trivial: spelling fix in ppc code comments trivial: fix typo in bio_alloc kernel doc trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt trivial: Miscellaneous documentation typo fixes trivial: fix typo milisecond/millisecond for documentation and source comments. ...
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 0bf8a882ee9e..5f66ba295c5d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1073,7 +1073,7 @@ and is between 256 and 4096 characters. It is defined in the file
1073 1073
1074 kgdboc= [HW] kgdb over consoles. 1074 kgdboc= [HW] kgdb over consoles.
1075 Requires a tty driver that supports console polling. 1075 Requires a tty driver that supports console polling.
1076 (only serial suported for now) 1076 (only serial supported for now)
1077 Format: <serial_device>[,baud] 1077 Format: <serial_device>[,baud]
1078 1078
1079 kmac= [MIPS] korina ethernet MAC address. 1079 kmac= [MIPS] korina ethernet MAC address.
@@ -1402,7 +1402,7 @@ and is between 256 and 4096 characters. It is defined in the file
1402 ('y', default) or cooked coordinates ('n') 1402 ('y', default) or cooked coordinates ('n')
1403 1403
1404 mtrr_chunk_size=nn[KMG] [X86] 1404 mtrr_chunk_size=nn[KMG] [X86]
1405 used for mtrr cleanup. It is largest continous chunk 1405 used for mtrr cleanup. It is largest continuous chunk
1406 that could hold holes aka. UC entries. 1406 that could hold holes aka. UC entries.
1407 1407
1408 mtrr_gran_size=nn[KMG] [X86] 1408 mtrr_gran_size=nn[KMG] [X86]