Merge branch 'next' into for-linus (b26a95d4) · Commits · Martyn Welch / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

b26a95d4

Commit b26a95d4 authored 9 years ago by Dmitry Torokhov

Downloads
- Plain Diff

Merge branch 'next' into for-linus

Prepare second round of input updates for 4.5 merge window.

parents 009f7738 809d9516

No related branches found

No related tags found

No related merge requests found

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Documentation/devicetree/bindings/input/gpio-keys.txt 1 addition, 0 deletions

Documentation/devicetree/bindings/input/gpio-keys.txt
drivers/input/joystick/xpad.c 425 additions, 166 deletions

drivers/input/joystick/xpad.c
drivers/input/keyboard/gpio_keys.c 4 additions, 2 deletions

drivers/input/keyboard/gpio_keys.c
drivers/input/touchscreen/atmel_mxt_ts.c 26 additions, 42 deletions

drivers/input/touchscreen/atmel_mxt_ts.c

with 456 additions and 210 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