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

Conflicts:

	drivers/input/mouse/appletouch.c

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

..

acecad.c

Input: replace remaining __FUNCTION__ occurrences

2008-05-16 14:45:58 -04:00

aiptek.c

Input: replace remaining __FUNCTION__ occurrences

2008-05-16 14:45:58 -04:00

gtco.c

Input: gtco - fix double kfree in error handling path

2008-05-30 10:40:28 -04:00

kbtab.c

Input: replace remaining __FUNCTION__ occurrences

2008-05-16 14:45:58 -04:00

Kconfig

Input: aiptek - add support for Genius G-PEN 560 tablet

2008-04-15 13:13:10 -04:00

Makefile

Input: move USB tablets under drivers/input/tablet

2007-05-08 01:41:29 -04:00

wacom_sys.c

Input: replace remaining __FUNCTION__ occurrences

2008-05-16 14:45:58 -04:00

wacom_wac.c

Input: wacom - cleanup handling of tablet IDs

2008-05-16 14:49:32 -04:00

wacom_wac.h

Input: wacom - add support for Bamboo1, BambooFun, and Cintiq 12WX

2008-03-14 11:54:38 -04:00

wacom.h

Input: wacom - make one-bit signed bitfields unsigned

2008-05-16 14:49:39 -04:00