]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9a3ada0574d78cd4e5e2d563011e5940b942b3ee
tree7f46722dcd4bdce411612d9ccb83651795dad5e3
parente1ec0707f5e68d05c4606f9c40e08b0ec3a97442
parentb72e4bd9199ff5a81e787b41154b405157abe456
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