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

fc73697b

Commit fc73697b authored 14 years ago by Jiri Kosina

Downloads
- Plain Diff

Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

parents 1c5474a6 8c8b01c3

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

drivers/hid/Kconfig 6 additions, 0 deletions

drivers/hid/Kconfig
drivers/hid/Makefile 1 addition, 0 deletions

drivers/hid/Makefile
drivers/hid/hid-core.c 1 addition, 0 deletions

drivers/hid/hid-core.c
drivers/hid/hid-elecom.c 57 additions, 0 deletions

drivers/hid/hid-elecom.c
drivers/hid/hid-ids.h 42 additions, 39 deletions

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

drivers/hid/hid-input.c
drivers/hid/hid-picolcd.c 166 additions, 33 deletions

drivers/hid/hid-picolcd.c
drivers/hid/hidraw.c 0 additions, 2 deletions

drivers/hid/hidraw.c

with 276 additions and 74 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