Dmitry Torokhov 554738da71 Merge branch 'next' into for-linus ...

Conflicts:
	include/linux/input.h

2011-01-06 22:34:59 -08:00

..

acecad.c

…

aiptek.c

…

gtco.c

…

hanwang.c

…

kbtab.c

…

Kconfig

…

Makefile

…

wacom_sys.c

…

wacom_wac.c

Merge branch 'next' into for-linus

2011-01-06 22:34:59 -08:00

wacom_wac.h

…

wacom.h

…