Merge branch 'next' into for-linus (99380825) · 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

99380825

Commit 99380825 authored 13 years ago by Dmitry Torokhov

Downloads
- Plain Diff

Merge branch 'next' into for-linus

Conflicts:
	drivers/input/tablet/wacom_sys.c

parents 10ce3cc9 131c713f

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/plat-spear/include/plat/keyboard.h 0 additions, 7 deletions

arch/arm/plat-spear/include/plat/keyboard.h
drivers/input/joystick/amijoy.c 3 additions, 0 deletions

drivers/input/joystick/amijoy.c
drivers/input/keyboard/gpio_keys.c 169 additions, 90 deletions

drivers/input/keyboard/gpio_keys.c
drivers/input/keyboard/tegra-kbc.c 1 addition, 0 deletions

drivers/input/keyboard/tegra-kbc.c
drivers/input/mouse/sentelic.c 224 additions, 70 deletions

drivers/input/mouse/sentelic.c
drivers/input/mouse/sentelic.h 33 additions, 2 deletions

drivers/input/mouse/sentelic.h
drivers/input/tablet/Kconfig 1 addition, 0 deletions

drivers/input/tablet/Kconfig
drivers/input/tablet/wacom.h 9 additions, 0 deletions

drivers/input/tablet/wacom.h
drivers/input/tablet/wacom_sys.c 198 additions, 31 deletions

drivers/input/tablet/wacom_sys.c
drivers/input/tablet/wacom_wac.c 48 additions, 1 deletion

drivers/input/tablet/wacom_wac.c
drivers/input/tablet/wacom_wac.h 6 additions, 0 deletions

drivers/input/tablet/wacom_wac.h
include/linux/gpio_keys.h 2 additions, 1 deletion

include/linux/gpio_keys.h

with 694 additions and 202 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