Merge branch 'next' into for-linus

[linux-2.6-block.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 88600fe5fdc3f048e9da32a7d755589fb66af502..c44bf65b8cd9fd6316c1176cd75ecf0a6466b0b0 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -365,6 +365,8 @@ and is between 256 and 4096 characters. It is defined in the file
                        no delay (0).
                        Format: integer
 
+       bootmem_debug   [KNL] Enable bootmem allocator debug messages.
+
        bttv.card=      [HW,V4L] bttv (bt848 + bt878 based grabber cards)
        bttv.radio=     Most important insmod options are available as
                        kernel args too.
@@ -1073,6 +1075,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
                        * [no]ncq: Turn on or off NCQ.
 
+                       * nohrst, nosrst, norst: suppress hard, soft
+                          and both resets.
+
                        If there are multiple matching configurations changing
                        the same attribute, the last one is used.