Merge branch 'next' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 20 Feb 2017 23:16:02 +0000 (15:16 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 20 Feb 2017 23:16:02 +0000 (15:16 -0800)
commit6e11617fcff3688f70650a3e40addb0043dda137
treea24f378c1a1e9f627ca1076a8b5bbd2ad7422630
parent722c5ac708b4f5c1fcfad5fed4c95234c8b06590
parenta1b5359271e5c77d5ec8a575b379a6ba3e867097
Merge branch 'next' into for-linus

Prepare input updates for 4.11 merge window.
drivers/input/mouse/elan_i2c_core.c
drivers/input/rmi4/Kconfig
drivers/input/rmi4/rmi_driver.c