Greg Kroah-Hartman 61906313bd Merge 3.4-rc6 into usb-next ...

This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-05-07 09:03:39 -07:00

..

alps.c

Input: ALPS - fix touchpad detection when buttons are pressed

2012-02-24 00:46:45 -08:00

alps.h

Input: ALPS - add semi-MT support for v3 protocol

2011-11-07 22:22:11 -08:00

amimouse.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

appletouch.c

USB: input: appletouch: fix up compiler warning

2012-05-04 15:35:56 -07:00

atarimouse.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

bcm5974.c

USB: input: bcm5974.c: fix up dev_* messages

2012-05-04 15:33:02 -07:00

elantech.c

Input: elantech - v4 is a clickpad, with only one button

2012-04-10 00:40:35 -07:00

elantech.h

Input: elantech - add resolution query support for v4 hardware

2011-11-20 22:28:34 -08:00

gpio_mouse.c

Input: gpio_mouse - use linux/gpio.h rather than asm/gpio.h

2012-04-10 09:05:27 -07:00

hgpk.c

Input: psmouse - use psmouse_[de]activate() from sentelic and hgpk drivers

2012-02-24 00:55:33 -08:00

hgpk.h

Input: psmouse - switch to using dev_*() for messages

2011-10-10 18:28:16 -07:00

inport.c

…

Kconfig

Input: add Synaptics USB device driver

2012-02-03 00:25:03 -08:00

lifebook.c

Input: psmouse - switch to using dev_*() for messages

2011-10-10 18:28:16 -07:00

lifebook.h

…

logibm.c

…

logips2pp.c

Input: convert obsolete strict_strtox to kstrtox

2011-11-09 21:23:26 -08:00

logips2pp.h

…

Makefile

Input: add Synaptics USB device driver

2012-02-03 00:25:03 -08:00

maplemouse.c

…

pc110pad.c

Input: switch to input_abs_*() access functions

2010-08-02 20:29:56 -07:00

psmouse-base.c

Merge commit 'v3.3-rc6' into next

2012-03-09 10:55:17 -08:00

psmouse.h

Input: psmouse - allow drivers to use psmouse_{de,}activate

2012-02-24 00:55:28 -08:00

pxa930_trkball.c

Input: mouse - use macro module_platform_driver()

2011-11-30 23:41:42 -08:00

rpcmouse.c

…

sentelic.c

Input: sentelic - filter taps in absolute mode

2012-04-03 09:55:51 -07:00

sentelic.h

Input: sentelic - enabling absolute coordinates output for newer hardware

2012-03-25 17:18:10 -07:00

sermouse.c

…

synaptics_i2c.c

Input: convert I2C drivers to use module_i2c_driver()

2012-03-16 23:06:19 -07:00

synaptics_usb.c

Input: synaptics_usb - switch to module_usb_driver()

2012-03-16 23:06:34 -07:00

synaptics.c

Input: synaptics - fix regression with "image sensor" trackpads

2012-04-20 22:47:28 -07:00

synaptics.h

Input: synaptics - add support for Relative mode

2011-11-09 21:23:31 -08:00

touchkit_ps2.c

Update broken web addresses in the kernel.

2010-10-18 11:03:14 +02:00

touchkit_ps2.h

…

trackpoint.c

Input: trackpoint - use psmouse_fmt() for messages

2012-04-10 00:40:39 -07:00

trackpoint.h

…

vsxxxaa.c

Fix common misspellings

2011-03-31 11:26:23 -03:00