Merge branch 'merge'
[linux-2.6] / drivers / input /
drwxr-xr-x   ..
-rw-r--r-- 4294 Kconfig
-rw-r--r-- 563 Makefile
-rw-r--r-- 2847 evbug.c
-rw-r--r-- 17350 evdev.c
drwxr-xr-x - gameport
-rw-r--r-- 29031 input.c
-rw-r--r-- 16324 joydev.c
drwxr-xr-x - joystick
drwxr-xr-x - keyboard
drwxr-xr-x - misc
drwxr-xr-x - mouse
-rw-r--r-- 20208 mousedev.c
-rw-r--r-- 4180 power.c
drwxr-xr-x - serio
drwxr-xr-x - touchscreen
-rw-r--r-- 13324 tsdev.c