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

e7de3690

Commit e7de3690 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

parents 87530db5 eab9edd2

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

drivers/input/mouse/alps.c 38 additions, 0 deletions

drivers/input/mouse/alps.c
drivers/input/mouse/logips2pp.c 1 addition, 1 deletion

drivers/input/mouse/logips2pp.c
drivers/input/mouse/psmouse-base.c 252 additions, 64 deletions

drivers/input/mouse/psmouse-base.c
drivers/input/mouse/psmouse.h 8 additions, 1 deletion

drivers/input/mouse/psmouse.h
drivers/input/mouse/synaptics.c 2 additions, 0 deletions

drivers/input/mouse/synaptics.c
drivers/input/serio/i8042-x86ia64io.h 7 additions, 0 deletions

drivers/input/serio/i8042-x86ia64io.h
drivers/usb/input/Kconfig 10 additions, 0 deletions

drivers/usb/input/Kconfig
drivers/usb/input/hid-core.c 30 additions, 0 deletions

drivers/usb/input/hid-core.c
drivers/usb/input/hid-input.c 176 additions, 3 deletions

drivers/usb/input/hid-input.c
drivers/usb/input/hid.h 19 additions, 11 deletions

drivers/usb/input/hid.h
drivers/usb/input/pid.c 1 addition, 1 deletion

drivers/usb/input/pid.c
drivers/usb/input/wacom.c 7 additions, 7 deletions

drivers/usb/input/wacom.c

with 551 additions and 88 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