Merge tag 'v3.17-rc5' into usb-next

USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.

Signed-off-by: Johan Hovold <johan@kernel.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 9922cc46b15c..cb6066c809ea 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1030,6 +1030,10 @@ static struct dmi_system_id ec_dmi_table[] __initdata = {
         DMI_MATCH(DMI_SYS_VENDOR, "Quanta"),
         DMI_MATCH(DMI_PRODUCT_NAME, "TW9/SW9"),}, NULL},
         {
+        ec_flag_msi, "Clevo W350etq", {
+        DMI_MATCH(DMI_SYS_VENDOR, "CLEVO CO."),
+        DMI_MATCH(DMI_PRODUCT_NAME, "W35_37ET"),}, NULL},
+        {
         ec_validate_ecdt, "ASUS hardware", {
         DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},
         {