Merge branch 'for-linus' into next (2969869b) · Commits · Linaro / qcomlt / kernel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kernel
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

2969869b

Commit 2969869b authored 4 years ago by Dmitry Torokhov

Downloads
- Plain Diff

Merge branch 'for-linus' into next

Merge for-linus branch to sync Elan touchscreen driver code.

parents 04e49867 d34fced4

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

drivers/input/evdev.c 4 additions, 15 deletions

drivers/input/evdev.c
drivers/input/joystick/xpad.c 12 additions, 0 deletions

drivers/input/joystick/xpad.c
drivers/input/keyboard/applespi.c 1 addition, 1 deletion

drivers/input/keyboard/applespi.c
drivers/input/keyboard/cros_ec_keyb.c 5 additions, 9 deletions

drivers/input/keyboard/cros_ec_keyb.c
drivers/input/keyboard/dlink-dir685-touchkeys.c 1 addition, 1 deletion

drivers/input/keyboard/dlink-dir685-touchkeys.c
drivers/input/misc/axp20x-pek.c 37 additions, 35 deletions

drivers/input/misc/axp20x-pek.c
drivers/input/rmi4/rmi_driver.c 3 additions, 2 deletions

drivers/input/rmi4/rmi_driver.c
drivers/input/serio/i8042-x86ia64io.h 7 additions, 0 deletions

drivers/input/serio/i8042-x86ia64io.h
drivers/input/touchscreen/elants_i2c.c 10 additions, 1 deletion

drivers/input/touchscreen/elants_i2c.c
drivers/input/touchscreen/mms114.c 5 additions, 7 deletions

drivers/input/touchscreen/mms114.c
drivers/input/touchscreen/usbtouchscreen.c 1 addition, 0 deletions

drivers/input/touchscreen/usbtouchscreen.c
include/linux/input/lm8333.h 1 addition, 1 deletion

include/linux/input/lm8333.h

with 87 additions and 72 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment