Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

ada8c797

Commit ada8c797 authored 14 years ago by Jiri Kosina

Downloads
- Plain Diff

Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

parents 35d03a0d 7d876c05 0b3fa399 70c7c9c4

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/ABI/testing/sysfs-driver-hid-roccat-kone 0 additions, 13 deletions

Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
drivers/hid/hid-core.c 2 additions, 0 deletions

drivers/hid/hid-core.c
drivers/hid/hid-ids.h 3 additions, 1 deletion

drivers/hid/hid-ids.h
drivers/hid/hid-input.c 9 additions, 9 deletions

drivers/hid/hid-input.c
drivers/hid/hid-magicmouse.c 73 additions, 23 deletions

drivers/hid/hid-magicmouse.c
drivers/hid/hid-roccat-kone.c 2 additions, 23 deletions

drivers/hid/hid-roccat-kone.c
drivers/hid/hid-roccat-kone.h 0 additions, 2 deletions

drivers/hid/hid-roccat-kone.h
drivers/hid/hid-roccat.c 6 additions, 3 deletions

drivers/hid/hid-roccat.c
drivers/hid/hid-roccat.h 1 addition, 1 deletion

drivers/hid/hid-roccat.h
drivers/hid/usbhid/hid-quirks.c 2 additions, 0 deletions

drivers/hid/usbhid/hid-quirks.c
include/linux/hid.h 1 addition, 0 deletions

include/linux/hid.h

with 99 additions and 75 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