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

9929ffed

Commit 9929ffed authored 14 years ago by Jiri Kosina

Downloads
- Plain Diff

Merge branch 'upstream-fixes' into for-linus

Conflicts:
	drivers/hid/hid-ids.h

parents fc73697b d5e0a06f

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

drivers/hid/Kconfig 3 additions, 2 deletions

drivers/hid/Kconfig
drivers/hid/hid-core.c 1 addition, 1 deletion

drivers/hid/hid-core.c
drivers/hid/hid-ids.h 6 additions, 4 deletions

drivers/hid/hid-ids.h
drivers/hid/hid-topseed.c 5 additions, 0 deletions

drivers/hid/hid-topseed.c
drivers/hid/hid-wacom.c 1 addition, 1 deletion

drivers/hid/hid-wacom.c

with 16 additions and 8 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