Merge branches 'release', 'dmi' and 'misc' into release

3 files changed, 24 insertions, 5 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 7ef172c2a1d6..f688c214be0c 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -204,13 +204,25 @@ config ACPI_NUMA
 
 config ACPI_WMI
         tristate "WMI (EXPERIMENTAL)"
+        depends on X86
         depends on EXPERIMENTAL
         help
-          This driver adds support for the ACPI-WMI mapper device (PNP0C14)
-          found on some systems.
+          This driver adds support for the ACPI-WMI (Windows Management
+          Instrumentation) mapper device (PNP0C14) found on some systems.
+
+          ACPI-WMI is a proprietary extension to ACPI to expose parts of the
+          ACPI firmware to userspace - this is done through various vendor
+          defined methods and data blocks in a PNP0C14 device, which are then
+          made available for userspace to call.
+
+          The implementation of this in Linux currently only exposes this to
+          other kernel space drivers.
+
+          This driver is a required dependency to build the firmware specific
+          drivers needed on many machines, including Acer and HP laptops.
 
-          NOTE: You will need another driver or userspace application on top of
-          this to actually use anything defined in the ACPI-WMI mapper.
+          It is safe to enable this driver even if your DSDT doesn't define
+          any ACPI-WMI devices.
 
 config ACPI_ASUS
         tristate "ASUS/Medion Laptop Extras"
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 27ccd68b8f46..a14501c98f40 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -343,7 +343,7 @@ struct acpi_table_header *acpi_find_dsdt_initrd(void)
         struct kstat stat;
         char *ramfs_dsdt_name = "/DSDT.aml";
 
-        printk(KERN_INFO PREFIX "Checking initramfs for custom DSDT");
+        printk(KERN_INFO PREFIX "Checking initramfs for custom DSDT\n");
 
         /*
          * Never do this at home, only the user-space is allowed to open a file.
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index f32010bee4d5..b477a4be8a69 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -50,6 +50,10 @@ ACPI_MODULE_NAME("processor_perflib");
 
 static DEFINE_MUTEX(performance_mutex);
 
+/* Use cpufreq debug layer for _PPC changes. */
+#define cpufreq_printk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_CORE, \
+                                                "cpufreq-core", msg)
+
 /*
  * _PPC support is implemented as a CPUfreq policy notifier:
  * This means each time a CPUfreq driver registered also with
@@ -131,6 +135,9 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
                 return -ENODEV;
         }
 
+        cpufreq_printk("CPU %d: _PPC is %d - frequency %s limited\n", pr->id,
+                       (int)ppc, ppc ? "" : "not");
+
         pr->performance_platform_limit = (int)ppc;
 
         return 0;