Merge branch 'for-linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 22 Jul 2020 05:17:27 +0000 (22:17 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 22 Jul 2020 05:17:27 +0000 (22:17 -0700)
commita5c33d5f745ca1ecfbd692a531ef2a12bfeeb57e
tree7f46722dcd4bdce411612d9ccb83651795dad5e3
parent9b031c86506cef9acae45e61339fcf9deaabb793
parenta50ca29523b18baea548bdf5df9b4b923c2bb4f6
Merge branch 'for-linus' into next

Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.
drivers/input/mouse/elan_i2c_core.c
drivers/input/touchscreen/elants_i2c.c
include/linux/mod_devicetable.h