linux/drivers/input/mouse
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
..
alps.c Input: psmouse - switch to using dev_*() for messages 2011-10-10 18:28:16 -07:00
alps.h Input: ALPS - add interleaved protocol support (Dell E6x00 series) 2009-12-15 22:15:25 -08:00
amimouse.c m68k: amiga - Mouse platform device conversion 2010-05-26 19:51:09 +02:00
appletouch.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
atarimouse.c input/atari: Fix mouse movement and button mapping 2011-05-19 18:19:12 +02:00
bcm5974.c USB: convert drivers/input/* to use module_usb_driver() 2011-11-18 09:48:31 -08:00
elantech.c Input: elantech - adjust hw_version detection logic 2011-11-09 21:19:47 -08:00
elantech.h Input: elantech - better support all those v2 variants 2011-09-20 22:46:27 -07:00
gpio_mouse.c Input: update author email for gpio_mouse, at32psif, and atmel-wm97xx 2011-06-29 00:26:02 -07:00
hgpk.c Input: psmouse - switch to using dev_*() for messages 2011-10-10 18:28:16 -07:00
hgpk.h Input: psmouse - switch to using dev_*() for messages 2011-10-10 18:28:16 -07:00
inport.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
Kconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
lifebook.c Input: psmouse - switch to using dev_*() for messages 2011-10-10 18:28:16 -07:00
lifebook.h Input: psmouse - do not carry DMI data around 2009-12-03 23:25:36 -08:00
logibm.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
logips2pp.c Input: psmouse - switch to using dev_*() for messages 2011-10-10 18:28:16 -07:00
logips2pp.h Input: psmouse - use boolean type 2009-09-10 22:11:38 -07:00
Makefile Input: add new driver for Sentelic Finger Sensing Pad 2009-08-19 21:46:09 -07:00
maplemouse.c maple: input: fix up maple mouse driver 2009-04-27 09:22:31 +09:00
pc110pad.c Input: switch to input_abs_*() access functions 2010-08-02 20:29:56 -07:00
psmouse-base.c Input: psmouse - switch to using dev_*() for messages 2011-10-10 18:28:16 -07:00
psmouse.h Input: psmouse - switch to using dev_*() for messages 2011-10-10 18:28:16 -07:00
pxa930_trkball.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
rpcmouse.c [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h 2009-03-25 10:21:35 +00:00
sentelic.c Input: sentelic - fix retrieving number of buttons 2011-12-29 09:52:59 -08:00
sentelic.h Input: sentelic - fix retrieving number of buttons 2011-12-29 09:52:59 -08:00
sermouse.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
synaptics_i2c.c Input: synaptics_i2c - wrap suspend and resume in CONFIG_PM_SLEEP 2011-10-06 19:43:00 -07:00
synaptics.c Input: synaptics - fix touchpad not working after S2R on Vostro V13 2011-12-12 00:06:56 -08:00
synaptics.h Input: synaptics - process finger (<=3) transitions 2011-08-23 23:08:24 -07:00
touchkit_ps2.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
touchkit_ps2.h Input: psmouse - use boolean type 2009-09-10 22:11:38 -07:00
trackpoint.c Input: return -ENOMEM in select drivers when memory allocation fails 2010-10-13 07:49:23 -07:00
trackpoint.h Input: psmouse - use boolean type 2009-09-10 22:11:38 -07:00
vsxxxaa.c Fix common misspellings 2011-03-31 11:26:23 -03:00