Merge branch 'linus' into tracing/hw-branch-tracing

2 files changed, 9 insertions, 4 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index edab81c13182..f44552e07913 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -221,14 +221,17 @@ and is between 256 and 4096 characters. It is defined in the file
                         Bits in debug_level correspond to a level in
                         ACPI_DEBUG_PRINT statements, e.g.,
                             ACPI_DEBUG_PRINT((ACPI_DB_INFO, ...
-                        See Documentation/acpi/debug.txt for more information
-                        about debug layers and levels.
+                        The debug_level mask defaults to "info".  See
+                        Documentation/acpi/debug.txt for more information about
+                        debug layers and levels.
 
+                        Enable processor driver info messages:
+                            acpi.debug_layer=0x20000000
+                        Enable PCI/PCI interrupt routing info messages:
+                            acpi.debug_layer=0x400000
                         Enable AML "Debug" output, i.e., stores to the Debug
                         object while interpreting AML:
                             acpi.debug_layer=0xffffffff acpi.debug_level=0x2
-                        Enable PCI/PCI interrupt routing info messages:
-                            acpi.debug_layer=0x400000 acpi.debug_level=0x4
                         Enable all messages related to ACPI hardware:
                             acpi.debug_layer=0x2 acpi.debug_level=0xffffffff
 
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 3cd2ad958176..394d7d378dc7 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1063,6 +1063,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
         STAC9227/9228/9229/927x
           ref           Reference board
+          ref-no-jd     Reference board without HP/Mic jack detection
           3stack        D965 3stack
           5stack        D965 5stack + SPDIF
           dell-3stack   Dell Dimension E520
@@ -1076,6 +1077,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
         STAC92HD73*
           ref           Reference board
+          no-jd         BIOS setup but without jack-detection
           dell-m6-amic  Dell desktops/laptops with analog mics
           dell-m6-dmic  Dell desktops/laptops with digital mics
           dell-m6       Dell desktops/laptops with both type of mics