Dmitry Torokhov 95d465fd75 Manual merge with Linus. ...

Conflicts:
	arch/powerpc/kernel/setup-common.c
	drivers/input/keyboard/hil_kbd.c
	drivers/input/mouse/hil_ptr.c

2006-04-02 00:08:05 -05:00

..

alps.c

Input: psmouse - attempt to re-synchronize mouse every 5 seconds

2006-01-14 00:27:37 -05:00

alps.h

[PATCH] drivers/input/mouse: convert to dynamic input_dev allocation

2005-10-28 09:52:52 -07:00

amimouse.c

[PATCH] m68k: namespace pollution fix (custom->amiga_custom)

2006-01-12 09:09:00 -08:00

hil_ptr.c

Manual merge with Linus.

2006-04-02 00:08:05 -05:00

inport.c

[PATCH] drivers/input/mouse: convert to dynamic input_dev allocation

2005-10-28 09:52:52 -07:00

Kconfig

Input: remove obsolete maple input drivers

2006-01-10 02:00:27 -05:00

lifebook.c

Input: lifebook - add DMI signature of Fujitsu Lifebook B142

2005-12-21 00:52:10 -05:00

lifebook.h

Input: lifebook - adjust initialization routines to be in line with

2005-05-29 02:30:32 -05:00

logibm.c

[PATCH] drivers/input/mouse: convert to dynamic input_dev allocation

2005-10-28 09:52:52 -07:00

logips2pp.c

Input: logips2pp - add new signature (99)

2006-02-15 00:48:58 -05:00

logips2pp.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile

Input: remove obsolete maple input drivers

2006-01-10 02:00:27 -05:00

pc110pad.c

[PATCH] drivers/input/mouse: convert to dynamic input_dev allocation

2005-10-28 09:52:52 -07:00

psmouse-base.c

Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-03-13 23:36:52 -05:00

psmouse.h

Input: psmouse - attempt to re-synchronize mouse every 5 seconds

2006-01-14 00:27:37 -05:00

rpcmouse.c

[PATCH] drivers/input/mouse: convert to dynamic input_dev allocation

2005-10-28 09:52:52 -07:00

sermouse.c

[SERMOUSE]: Sun mice speak 5-byte protocol too.

2005-12-28 13:27:04 -08:00

synaptics.c

Input: use kzalloc() throughout the code

2006-03-14 00:09:16 -05:00

synaptics.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

trackpoint.c

Input: trackpoint - enable devices connected to external port

2006-02-15 00:49:09 -05:00

trackpoint.h

Input: trackpoint - enable devices connected to external port

2006-02-15 00:49:09 -05:00

vsxxxaa.c

[PATCH] drivers/input/mouse: convert to dynamic input_dev allocation

2005-10-28 09:52:52 -07:00