Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

de6c5070

Commit de6c5070 authored 7 years ago by Jiri Kosina

Downloads
- Plain Diff

Merge branch 'for-4.14/wacom' into for-linus

- name generation improvement for Wacom devices from Jason Gerecke
- Kconfig dependency fix for Wacom driver from Arnd Bergmann

parents 5c891d5e 9d14201c

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/hid/Kconfig 1 addition, 1 deletion

drivers/hid/Kconfig
drivers/hid/i2c-hid/i2c-hid.c 2 additions, 1 deletion

drivers/hid/i2c-hid/i2c-hid.c
drivers/hid/uhid.c 2 additions, 1 deletion

drivers/hid/uhid.c
drivers/hid/usbhid/hid-core.c 2 additions, 1 deletion

drivers/hid/usbhid/hid-core.c
drivers/hid/wacom_sys.c 28 additions, 35 deletions

drivers/hid/wacom_sys.c
include/linux/hid.h 11 additions, 0 deletions

include/linux/hid.h
net/bluetooth/hidp/core.c 2 additions, 1 deletion

net/bluetooth/hidp/core.c

with 48 additions and 40 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