Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 14 Nov 2017 01:10:13 +0000 (17:10 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 14 Nov 2017 01:10:13 +0000 (17:10 -0800)
Prepare input updates for 4.15 merge window.

1  2 
drivers/input/mouse/elan_i2c_core.c
drivers/input/touchscreen/tsc200x-core.c

index d6135900da649680e9e23cd924541f63a3423fa7,2690a8223841402ab2cbfa3ea5d8a34a4232f19f..2111a85d0b177210bb1fcf10e5d55d9ff832f32d
@@@ -1255,10 -1259,8 +1259,9 @@@ static const struct acpi_device_id elan
        { "ELAN0602", 0 },
        { "ELAN0605", 0 },
        { "ELAN0608", 0 },
-       { "ELAN0605", 0 },
        { "ELAN0609", 0 },
        { "ELAN060B", 0 },
 +      { "ELAN060C", 0 },
        { "ELAN0611", 0 },
        { "ELAN1000", 0 },
        { }