Skip to content
GitLab
Explore
Sign in
Register
xcap
xcap-capability-linux
Repository
xcap-capability-linux
drivers
hid
hidraw.c
Find file
Blame
History
Permalink
Merge branch 'for-4.7/upstream' into for-linus
· 3390e579
Jiri Kosina
authored
May 17, 2016
Conflicts: drivers/hid/usbhid/hid-quirks.c
3390e579