From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed, 8 Nov 2017 02:11:56 +0000 (-0800)
Subject: Merge tag 'v4.14-rc8' into next
X-Git-Tag: v4.19~15^2~72^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v4.14-rc8' into next

Merge with mainline to bring in SPDX markings to avoid annoying merge
problems when some header files get deleted.
---

0f1cd81d4a50ca99fb0b5cd8f68584bc5acab081
diff --cc drivers/input/mouse/elan_i2c_core.c
index c33f2cc,6d6b092..2690a82
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@@ -1259,8 -1255,10 +1259,9 @@@ static const struct acpi_device_id elan
  	{ "ELAN0602", 0 },
  	{ "ELAN0605", 0 },
  	{ "ELAN0608", 0 },
 -	{ "ELAN0605", 0 },
  	{ "ELAN0609", 0 },
  	{ "ELAN060B", 0 },
+ 	{ "ELAN0611", 0 },
  	{ "ELAN1000", 0 },
  	{ }
  };