Merge branch 'linux-2.6'

1 files changed, 15 insertions, 6 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 2fc1fb896afc..db122df5e77d 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -527,29 +527,30 @@ and is between 256 and 4096 characters. It is defined in the file
                         Format: <area>[,<node>]
                         See also Documentation/networking/decnet.txt.
 
-        default_blu=    [VT]
+        vt.default_blu= [VT]
                         Format: <blue0>,<blue1>,<blue2>,...,<blue15>
                         Change the default blue palette of the console.
                         This is a 16-member array composed of values
                         ranging from 0-255.
 
-        default_grn=    [VT]
+        vt.default_grn= [VT]
                         Format: <green0>,<green1>,<green2>,...,<green15>
                         Change the default green palette of the console.
                         This is a 16-member array composed of values
                         ranging from 0-255.
 
-        default_red=    [VT]
+        vt.default_red= [VT]
                         Format: <red0>,<red1>,<red2>,...,<red15>
                         Change the default red palette of the console.
                         This is a 16-member array composed of values
                         ranging from 0-255.
 
-        default_utf8=   [VT]
+        vt.default_utf8=
+                        [VT]
                         Format=<0|1>
                         Set system-wide default UTF-8 mode for all tty's.
-                        Default is 0 and by setting to 1, it enables UTF-8
-                        mode for all newly opened or allocated terminals.
+                        Default is 1, i.e. UTF-8 mode is enabled for all
+                        newly opened terminals.
 
         dhash_entries=  [KNL]
                         Set number of hash buckets for dentry cache.
@@ -883,6 +884,14 @@ and is between 256 and 4096 characters. It is defined in the file
         lapic_timer_c2_ok       [X86-32,x86-64,APIC] trust the local apic timer in
                         C2 power state.
 
+        libata.dma=     [LIBATA] DMA control
+                        libata.dma=0      Disable all PATA and SATA DMA
+                        libata.dma=1      PATA and SATA Disk DMA only
+                        libata.dma=2      ATAPI (CDROM) DMA only
+                        libata.dma=4      Compact Flash DMA only 
+                        Combinations also work, so libata.dma=3 enables DMA
+                        for disks and CDROMs, but not CFs.
+
         libata.noacpi   [LIBATA] Disables use of ACPI in libata suspend/resume
                         when set.
                         Format: <int>