Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

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

Snippets Groups Projects

3390e579

Commit 3390e579 authored 8 years ago by Jiri Kosina

Downloads
- Plain Diff

Merge branch 'for-4.7/upstream' into for-linus

Conflicts:
	drivers/hid/usbhid/hid-quirks.c

parents 27fd38c5 282bf1fe

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

drivers/hid/hid-core.c 15 additions, 18 deletions

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

drivers/hid/hid-ids.h
drivers/hid/hid-roccat.c 2 additions, 3 deletions

drivers/hid/hid-roccat.c
drivers/hid/hidraw.c 2 additions, 3 deletions

drivers/hid/hidraw.c
drivers/hid/usbhid/hid-quirks.c 5 additions, 0 deletions

drivers/hid/usbhid/hid-quirks.c

with 31 additions and 24 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