]> 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)
commite23e5ce0932bd94a390970f4a6605285bf99baf1
tree7f46722dcd4bdce411612d9ccb83651795dad5e3
parent6eb69b68f5c3c1cab8bb1ac074b4e36cae22b679
parentd4d81127e9bf95bb8236a4ccdca4cf0cf84eb4a8
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