Merge branch 'next' into for-linus

Prepare second round of input updates for 4.3 merge window.
This commit is contained in:
Dmitry Torokhov
2015-11-13 11:56:45 -08:00
9 changed files with 899 additions and 703 deletions

View File

@@ -1520,6 +1520,13 @@ static const struct dmi_system_id elantech_dmi_force_crc_enabled[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E544"),
},
},
{
/* Fujitsu LIFEBOOK U745 does not work with crc_enabled == 0 */
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U745"),
},
},
#endif
{ }
};