Merge branch 'for-4.8/hid-led' into for-linus (8c2f421c) · Commits · Linux Endpoint Security Framework / Linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

8c2f421c

Commit 8c2f421c authored 8 years ago by Jiri Kosina

Downloads
- Plain Diff

Merge branch 'for-4.8/hid-led' into for-linus

Conflicts:
	drivers/hid/hid-thingm.c

parents e82a82c1 f4c109b6

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

MAINTAINERS 0 additions, 5 deletions

MAINTAINERS
drivers/hid/Kconfig 19 additions, 4 deletions

drivers/hid/Kconfig
drivers/hid/Makefile 1 addition, 1 deletion

drivers/hid/Makefile
drivers/hid/hid-core.c 5 additions, 3 deletions

drivers/hid/hid-core.c
drivers/hid/hid-ids.h 6 additions, 0 deletions

drivers/hid/hid-ids.h
drivers/hid/hid-led.c 523 additions, 0 deletions

drivers/hid/hid-led.c
drivers/hid/hid-thingm.c 0 additions, 259 deletions

drivers/hid/hid-thingm.c
drivers/usb/misc/Kconfig 0 additions, 9 deletions

drivers/usb/misc/Kconfig
drivers/usb/misc/Makefile 0 additions, 1 deletion

drivers/usb/misc/Makefile
drivers/usb/misc/usbled.c 0 additions, 273 deletions

drivers/usb/misc/usbled.c

with 554 additions and 555 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