Dmitry Torokhov 15439dd37f Merge branch 'for-linus' into next ...

Conflicts:

	drivers/input/mouse/appletouch.c

2008-06-17 12:02:44 -04:00

..

alps.c

Input: ALPS - fix forward/back buttons reversed on Acer 5520-5290

2008-03-18 00:39:55 -04:00

alps.h

Input: ALPS - handle errors from input_register_device()

2007-04-12 01:31:13 -04:00

amimouse.c

get rid of input BIT* duplicate defines

2007-10-19 11:53:42 -07:00

appletouch.c

Merge branch 'for-linus' into next

2008-06-17 12:02:44 -04:00

atarimouse.c

get rid of input BIT* duplicate defines

2007-10-19 11:53:42 -07:00

gpio_mouse.c

Input: add MODULE_ALIAS() to hotpluggable platform modules

2008-04-24 13:24:59 -04:00

hil_ptr.c

Input: hil_ptr - check return value of input_register_device()

2008-05-16 14:50:37 -04:00

inport.c

Input: remove CVS keywords

2008-05-20 12:17:39 -04:00

Kconfig

Input: add gpio-mouse driver

2007-07-10 00:35:17 -04:00

lifebook.c

Input: psmouse - fix input_dev leak in lifebook driver

2008-01-17 12:01:51 -05:00

lifebook.h

…

logibm.c

Input: remove CVS keywords

2008-05-20 12:17:39 -04:00

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

Input: remove CVS keywords

2008-05-20 12:17:39 -04:00

psmouse-base.c

Input: drop redundant includes of moduleparam.h

2008-01-21 01:11:07 -05:00

psmouse.h

sysfs: kill unnecessary attribute->owner

2007-07-11 16:09:06 -07:00

rpcmouse.c

get rid of input BIT* duplicate defines

2007-10-19 11:53:42 -07:00

sermouse.c

Input: remove CVS keywords

2008-05-20 12:17:39 -04:00

synaptics.c

drivers/firmware: const-ify DMI API and internals

2007-10-09 20:22:20 -04:00

synaptics.h

…

touchkit_ps2.c

get rid of input BIT* duplicate defines

2007-10-19 11:53:42 -07:00

touchkit_ps2.h

Input: psmouse - make dummy touchkit_ps2_detect() static

2007-08-30 00:44:33 -04:00

trackpoint.c

Input: drop redundant includes of moduleparam.h

2008-01-21 01:11:07 -05:00

trackpoint.h

…

vsxxxaa.c

Spelling fix: explicitly

2007-10-19 23:22:55 +02:00