Merge branch 'next' into for-linus (91167e19) · Commits · Jason Kridner / Linux · GitLab

Forum | Documentation | Website | Blog

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

Admin message

Please reach out on Forum or Discord to get account approved. Manual approval required for all accounts due to hundreds of new account users daily from spambots.

91167e19

Commit 91167e19 authored 10 years ago by

Dmitry Torokhov

Downloads
- Plain Diff

Merge branch 'next' into for-linus

Prepare second round of input updates for 3.17.

parents a6b48699 3361a976

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/input/input-mt.c 27 additions, 11 deletions

drivers/input/input-mt.c
drivers/input/joystick/xpad.c 157 additions, 17 deletions

drivers/input/joystick/xpad.c
drivers/input/keyboard/cap1106.c 7 additions, 1 deletion

drivers/input/keyboard/cap1106.c
drivers/input/mouse/synaptics.c 69 additions, 3 deletions

drivers/input/mouse/synaptics.c
drivers/input/touchscreen/atmel_mxt_ts.c 198 additions, 168 deletions

drivers/input/touchscreen/atmel_mxt_ts.c
drivers/input/touchscreen/edt-ft5x06.c 0 additions, 1 deletion

drivers/input/touchscreen/edt-ft5x06.c
include/linux/input/mt.h 1 addition, 0 deletions

include/linux/input/mt.h

with 459 additions and 201 deletions

0% 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

Open hardware computers for makers, educators and professionals