Merge tag 'v4.12-rc3' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 30 May 2017 02:54:21 +0000 (19:54 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 30 May 2017 02:54:21 +0000 (19:54 -0700)
commitd8f797c60661a90ee26ca9330cf85ede9aa2ec17
tree5038609885fc3e4cb7f329d974875ac4411c6af5
parent8fd708157a592a376c4d0b3b2ba23b9e9f79caa5
parent5ed02dbb497422bf225783f46e6eadd237d23d6b
Merge tag 'v4.12-rc3' into next

Sync with mainline to bring in changes in platform drovers dropping
calls to sparse_keymap_free() so that we can remove it for good.
drivers/input/mouse/elan_i2c_i2c.c
drivers/input/mouse/elantech.c