From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 14 Nov 2017 01:10:13 +0000 (-0800)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: v4.15-rc1~117^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c25141062a82ae8bddced1b3ce2b57a1c0efabe0;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'next' into for-linus

Prepare input updates for 4.15 merge window.
---

c25141062a82ae8bddced1b3ce2b57a1c0efabe0
diff --cc drivers/input/mouse/elan_i2c_core.c
index d6135900da64,2690a8223841..2111a85d0b17
--- a/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 },
  	{ }