Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

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

Snippets Groups Projects

fa1054a2

Commit fa1054a2 authored 11 years ago by Jiri Kosina

Downloads
- Plain Diff

Merge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' into for-linus

parents 6cf8c85f 9abebedb b95dd3ca 4522643a

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/hid/uhid.txt 11 additions, 0 deletions

Documentation/hid/uhid.txt
drivers/hid/hid-ids.h 3 additions, 0 deletions

drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c 104 additions, 177 deletions

drivers/hid/hid-multitouch.c
drivers/hid/hid-sony.c 11 additions, 1 deletion

drivers/hid/hid-sony.c
drivers/hid/uhid.c 78 additions, 0 deletions

drivers/hid/uhid.c
include/linux/hid.h 3 additions, 0 deletions

include/linux/hid.h
include/uapi/linux/uhid.h 23 additions, 0 deletions

include/uapi/linux/uhid.h

with 233 additions and 178 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