Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers ... Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:16:29 +00:00
..
gameport
joystick	drivers/input: Add module.h to modular drivers implicitly using it	2011-10-31 19:31:16 -04:00
keyboard	input: samsung-keypad: Add device tree support	2011-12-23 10:07:10 +09:00
misc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-12-19 15:11:12 -08:00
mouse	Input: sentelic - fix retrieving number of buttons	2011-12-29 09:52:59 -08:00
serio	Input: ams_delta_serio - include linux/module.h	2011-11-09 21:19:54 -08:00
tablet	Input: wacom - add product id used by Samsung Slate 7	2011-12-12 00:00:55 -08:00
touchscreen	Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()	2011-12-28 10:14:18 +00:00
apm-power.c
evbug.c
evdev.c	Input: evdev - try to wake up readers only if we have full packet	2011-06-18 02:54:02 -07:00
ff-core.c	Input: force feedback - potential integer wrap in input_ff_create()	2011-10-12 21:13:11 -07:00
ff-memless.c
fixp-arith.h
input-compat.c	drivers/input: add export.h to symbol exporting files.	2011-10-31 19:31:16 -04:00
input-compat.h
input-mt.c	drivers/input: add export.h to symbol exporting files.	2011-10-31 19:31:16 -04:00
input-polldev.c	drivers/input: Add module.h to modular drivers implicitly using it	2011-10-31 19:31:16 -04:00
input.c
joydev.c
Kconfig	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
Makefile
mousedev.c
sparse-keymap.c	drivers/input: Add module.h to modular drivers implicitly using it	2011-10-31 19:31:16 -04:00