Merge tag 'v4.15' into next

Sync with mainline to get in trackpoint updates and other changes.
This commit is contained in:
Dmitry Torokhov
2018-02-01 00:41:33 -08:00
13193 changed files with 609627 additions and 287496 deletions

View File

@@ -173,6 +173,7 @@ static const char * const smbus_pnp_ids[] = {
"LEN0046", /* X250 */
"LEN004a", /* W541 */
"LEN200f", /* T450s */
"LEN2018", /* T460p */
NULL
};