6 files changed, 17 insertions, 13 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c205653e9644..ab686b310100 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -31,10 +31,14 @@ menuconfig ACPI
           ACPI CA, see:
           <http://acpica.org/>
 
-          ACPI is an open industry specification co-developed by
-          Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba.
+          ACPI is an open industry specification originally co-developed by
+          Hewlett-Packard, Intel, Microsoft, Phoenix, and Toshiba. Currently,
+          it is developed by the ACPI Specification Working Group (ASWG) under
+          the UEFI Forum and any UEFI member can join the ASWG and contribute
+          to the ACPI specification.
           The specification is available at:
           <http://www.acpi.info>
+          <http://www.uefi.org/acpi/specs>
 
 if ACPI
 
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index f0fc6260266b..d9339b442a4e 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -51,12 +51,6 @@ MODULE_PARM_DESC(immediate_undock, "1 (default) will cause the driver to "
         " the driver to wait for userspace to write the undock sysfs file "
         " before undocking");
 
-static const struct acpi_device_id dock_device_ids[] = {
-        {"LNXDOCK", 0},
-        {"", 0},
-};
-MODULE_DEVICE_TABLE(acpi, dock_device_ids);
-
 struct dock_station {
         acpi_handle handle;
         unsigned long last_dock_time;
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index f7fd72ac69cf..6776c599816f 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1219,10 +1219,9 @@ acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)
 {
         struct semaphore *sem = NULL;
 
-        sem = acpi_os_allocate(sizeof(struct semaphore));
+        sem = acpi_os_allocate_zeroed(sizeof(struct semaphore));
         if (!sem)
                 return AE_NO_MEMORY;
-        memset(sem, 0, sizeof(struct semaphore));
 
         sema_init(sem, initial_units);
 
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 964068553334..c1e31a41f949 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -344,7 +344,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
                         tz->trips.hot.flags.valid = 1;
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                         "Found hot threshold [%lu]\n",
-                                        tz->trips.critical.temperature));
+                                        tz->trips.hot.temperature));
                 }
         }
 
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 0f5f78fa6545..bba526148583 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -164,11 +164,10 @@ acpi_extract_package(union acpi_object *package,
          * Validate output buffer.
          */
         if (buffer->length == ACPI_ALLOCATE_BUFFER) {
-                buffer->pointer = ACPI_ALLOCATE(size_required);
+                buffer->pointer = ACPI_ALLOCATE_ZEROED(size_required);
                 if (!buffer->pointer)
                         return AE_NO_MEMORY;
                 buffer->length = size_required;
-                memset(buffer->pointer, 0, size_required);
         } else {
                 if (buffer->length < size_required) {
                         buffer->length = size_required;
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 48c7e8af9c96..8b6990e417ec 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -488,6 +488,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
                 },
         },
         {
+        .callback = video_set_use_native_backlight,
+        .ident = "Thinkpad Helix",
+        .matches = {
+                DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad Helix"),
+                },
+        },
+        {
          .callback = video_set_use_native_backlight,
          .ident = "Dell Inspiron 7520",
          .matches = {