Dmitry Torokhov 554738da71 Merge branch 'next' into for-linus ... Conflicts: include/linux/input.h		2011-01-06 22:34:59 -08:00
..
acecad.c	Input: acecad - fix a memory leak in usb_acecad_probe error path	2010-11-10 23:07:03 -08:00
aiptek.c	Input: aiptek - tighten up permissions on sysfs attributes	2010-11-15 22:59:40 -08:00
gtco.c
hanwang.c
kbtab.c
Kconfig
Makefile
wacom.h	Input: wacom - add support for digitizer in Lenovo W700	2010-12-23 01:22:55 -08:00
wacom_sys.c
wacom_wac.c	Merge branch 'next' into for-linus	2011-01-06 22:34:59 -08:00
wacom_wac.h	input: mt: Move tracking and pointer emulation to input-mt	2010-12-16 10:41:38 +01:00