Merge branch 'for-linus' into next

Sync up with 'for-linus' branch to avoid merge conflicts with following patches to Elan touchpad drivers.
2019-05-27 18:48:01 -07:00
parent b62f97634a 7c7da40da1
commit c114dc5e5b
4 changed files with 25 additions and 2 deletions
--- a/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@ -617,6 +617,7 @@ static const struct acpi_device_id silead_ts_acpi_match[] = {
 	{ "MSSL1680", 0 },
 	{ "MSSL0001", 0 },
 	{ "MSSL0002", 0 },
+	{ "MSSL0017", 0 },
 	{ }
 };
 MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match);