Dmitry Torokhov b981d8b3f5 Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/macintosh/adbhid.c		2007-10-12 21:27:47 -04:00
..
alps.c	Input: ALPS - add signature for ThinkPad R61	2007-10-11 00:49:19 -04:00
alps.h
amimouse.c
appletouch.c	Input: appletouch - fix idle reset logic	2007-09-25 00:06:25 -04:00
atarimouse.c	m68k: Atari keyboard and mouse support.	2007-05-04 17:59:05 -07:00
gpio_mouse.c	Input: add gpio-mouse driver	2007-07-10 00:35:17 -04:00
hil_ptr.c
inport.c
Kconfig	Input: add gpio-mouse driver	2007-07-10 00:35:17 -04:00
lifebook.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2007-10-12 21:27:47 -04:00
lifebook.h
logibm.c
logips2pp.c	Input: logips2pp - add type 72 (PS/2 TrackMan Marble)	2007-05-08 23:34:18 -04:00
logips2pp.h
Makefile	Input: add gpio-mouse driver	2007-07-10 00:35:17 -04:00
pc110pad.c
psmouse-base.c	Input: psmouse - reset harder during probe	2007-08-30 00:22:48 -04:00
psmouse.h	sysfs: kill unnecessary attribute->owner	2007-07-11 16:09:06 -07:00
rpcmouse.c
sermouse.c
synaptics.c	drivers/firmware: const-ify DMI API and internals	2007-10-09 20:22:20 -04:00
synaptics.h
touchkit_ps2.c
touchkit_ps2.h	Input: psmouse - make dummy touchkit_ps2_detect() static	2007-08-30 00:44:33 -04:00
trackpoint.c
trackpoint.h
vsxxxaa.c