From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Sat, 20 Jul 2019 04:07:56 +0000 (+0300)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: v5.3-rc1~7^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2;p=linux-2.6-block.git

Merge branch 'next' into for-linus

Prepare second round of input updates for 5.3 merge window.
---

c39f2d9db0fd81ea20bb5cce9b3f082ca63753e2
diff --cc drivers/input/mouse/synaptics.c
index 68fd8232d44c,b77b18c9ad02..b1956ed4c0dd
--- a/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 */