Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: usbtouchscreen - support bigger iNexio touchscreens
  Input: ads7846 - return error on regulator_get() failure
  Input: twl4030-vibra - correct the power down sequence
  Input: enable onkey driver of max8925
  Input: use ABS_CNT rather than (ABS_MAX + 1)

...

This commit is contained in:

Linus Torvalds 2010-05-27 09:19:55 -07:00

parent 03a3f695cb 388bbcade4

commit 7eb1053fd0

12 changed files with 189 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/hid/hid-debug.c

View file

10

drivers/input/joydev.c

View file

10

drivers/input/misc/Kconfig

View file

1

drivers/input/misc/Makefile

View file

148

drivers/input/misc/max8925_onkey.c

View file

2

drivers/input/misc/twl4030-vibra.c

View file

4

drivers/input/misc/uinput.c

View file

4

drivers/input/touchscreen/ads7846.c

View file

7

drivers/input/touchscreen/usbtouchscreen.c

View file