linux/drivers/input/tablet
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
acecad.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
aiptek.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
gtco.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
hanwang.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
kbtab.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
Kconfig Input: add support for Hanwang tablets 2010-09-01 23:26:18 -07:00
Makefile Input: add support for Hanwang tablets 2010-09-01 23:26:18 -07:00
wacom.h Input: wacom - add LED support for Cintiq 21ux2 2011-10-05 00:26:21 -07:00
wacom_sys.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
wacom_wac.c Input: wacom - add product id used by Samsung Slate 7 2011-12-12 00:00:55 -08:00
wacom_wac.h Input: wacom - report resolution for pen devices 2011-03-26 22:31:06 -07:00