Merge branch 'for-linus' into next

Browse source

Sync up with 'for-linus' branch to resolve conflict in Elan touchpad
driver.

...

This commit is contained in:

Dmitry Torokhov 2020-07-21 22:17:27 -07:00

parent 9b031c8650 a50ca29523

commit a5c33d5f74

9 changed files with 32 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/uapi/linux/input-event-codes.h

View file