Merge branch 'uhid' into for-linus (c062c4d1) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

c062c4d1

Commit c062c4d1 authored 12 years ago by Jiri Kosina

Downloads
- Plain Diff

Merge branch 'uhid' into for-linus

Conflicts:
	drivers/hid/Kconfig

parents 929bd380 adefb69b

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

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

Documentation/hid/uhid.txt
MAINTAINERS 7 additions, 0 deletions

MAINTAINERS
drivers/hid/Kconfig 21 additions, 0 deletions

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

drivers/hid/Makefile
drivers/hid/uhid.c 572 additions, 0 deletions

drivers/hid/uhid.c
include/linux/Kbuild 1 addition, 0 deletions

include/linux/Kbuild
include/linux/uhid.h 104 additions, 0 deletions

include/linux/uhid.h
samples/uhid/Makefile 10 additions, 0 deletions

samples/uhid/Makefile
samples/uhid/uhid-example.c 381 additions, 0 deletions

samples/uhid/uhid-example.c

with 1266 additions and 0 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