Merge tag 'v4.15' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 1 Feb 2018 08:41:33 +0000 (00:41 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 1 Feb 2018 08:41:33 +0000 (00:41 -0800)
commit10a558374f3751cf4eb55143008975641dfc2cf4
treeaab0def9d2289f6520ffb62ec4c1d738135447c4
parentfafef982c7353e8982b951e40573e990ccf0ed00
parentd8a5b80568a9cb66810e75b182018e9edb68e8ff
Merge tag 'v4.15' into next

Sync with mainline to get in trackpoint updates and other changes.
drivers/input/joystick/xpad.c
drivers/input/mouse/elan_i2c_core.c
drivers/input/mouse/synaptics.c
drivers/input/rmi4/rmi_driver.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/elants_i2c.c