Merge branch 'for-linus' into for-next

diff --cc drivers/platform/x86/serial-multi-instantiate.c
index 67feed25c9dbcc7b389d998353c2435bc448228e,e98007197cf5239e9193cc2525254478984d1001..5362f1a7b77c5df4c654c62c8b14fc09910feb16
--- 1/drivers/platform/x86/serial-multi-instantiate.c
--- 2/drivers/platform/x86/serial-multi-instantiate.c
+++ b/drivers/platform/x86/serial-multi-instantiate.c
@@@ -324,10 -325,11 +324,11 @@@ static const struct smi_node cs35l41_hd
  static const struct acpi_device_id smi_acpi_ids[] = {
        { "BSG1160", (unsigned long)&bsg1160_data },
        { "BSG2150", (unsigned long)&bsg2150_data },
 -      { "INT3515", (unsigned long)&int3515_data },
        { "CSC3551", (unsigned long)&cs35l41_hda },
 +      { "INT3515", (unsigned long)&int3515_data },
        /* Non-conforming _HID for Cirrus Logic already released */
        { "CLSA0100", (unsigned long)&cs35l41_hda },
+       { "CLSA0101", (unsigned long)&cs35l41_hda },
        { }
  };
  MODULE_DEVICE_TABLE(acpi, smi_acpi_ids);