Merge branch 'next' into for-linus

Prepare input updates for 4.15 merge window.

diff --cc drivers/input/mouse/elan_i2c_core.c
index d613590,2690a82..2111a85
--- 1/drivers/input/mouse/elan_i2c_core.c
--- 2/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@@ -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 },
        { }

diff --cc drivers/input/touchscreen/tsc200x-core.c
Simple merge