Merge branch 'next' into for-linus

Prepare second round of input updates for 5.3 merge window.

diff --cc drivers/input/mouse/synaptics.c
index 68fd8232d44cf9387e19589fb5152969b9bca1ff,b77b18c9ad024c09fee7cebd2aeb77ab12521a8a..b1956ed4c0ddeaf35b1f3cf65c0773e851a7c07d
--- 1/drivers/input/mouse/synaptics.c
--- 2/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@@ -176,9 -173,9 +173,10 @@@ static const char * const smbus_pnp_ids
        "LEN0072", /* X1 Carbon Gen 5 (2017) - Elan/ALPS trackpoint */
        "LEN0073", /* X1 Carbon G5 (Elantech) */
        "LEN0092", /* X1 Carbon 6 */
 +      "LEN0093", /* T480 */
        "LEN0096", /* X280 */
        "LEN0097", /* X280 -> ALPS trackpoint */
+       "LEN009b", /* T580 */
        "LEN200f", /* T450s */
        "LEN2054", /* E480 */
        "LEN2055", /* E580 */

diff --cc drivers/input/touchscreen/atmel_mxt_ts.c
Simple merge