Linus Torvalds 296bac30f6 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid ...

Pull HID updates from Jiri Kosina:
 "This contains fixes for two devices by Jiri Slaby and Xianhan Yu, new
  device IDs for MacBook Pro 10,2 from Dirk Hohndel and generic
  multitouch code fix from Alan Cox."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Add support for the MacBook Pro 10,2 keyboard / touchpad
  HID: multitouch: fix maxcontacts problem on GeneralTouch
  HID: multitouch: put the case in the right switch statement
  HID: microsoft: fix invalid rdesc for 3k kbd

2012-10-31 15:39:28 -07:00

..

alps.c

Input: MT - Add flags to input_mt_init_slots()

2012-09-19 19:50:18 +02:00

alps.h

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

2012-05-10 22:32:20 -07: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

HID: Add support for the MacBook Pro 10,2 keyboard / touchpad

2012-10-31 10:42:33 +01:00

elantech.c

Input: MT - Add flags to input_mt_init_slots()

2012-09-19 19:50:18 +02: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: hgpk - use %*ph to dump small buffer

2012-09-12 21:57:13 -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

Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver

2012-05-10 22:12:39 -07: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: convert obsolete strict_strtox to kstrtox

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

logips2pp.h

Input: psmouse - use boolean type

2009-09-10 22:11:38 -07:00

Makefile

Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver

2012-05-10 22:12:39 -07:00

maplemouse.c

maple: input: fix up maple mouse driver

2009-04-27 09:22:31 +09:00

navpoint.c

Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver

2012-05-10 22:12:39 -07:00

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

ARM: pxa: move platform_data definitions

2012-09-14 11:18:10 +02:00

rpcmouse.c

input: rpcmouse: use __iomem pointers for MMIO

2012-09-19 15:37:13 +02:00

sentelic.c

Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogic', 'wacom' and 'wiimote' into for-linus

2012-10-01 14:36:26 +02:00

sentelic.h

Input: sentelic - report device's production serial number

2012-05-10 20:39:04 -07:00

sermouse.c

Input: serio - use module_serio_driver

2012-04-04 09:25:43 -07:00

synaptics_i2c.c

workqueue: use mod_delayed_work() instead of __cancel + queue

2012-08-21 13:18:24 -07:00

synaptics_usb.c

Input: synaptics_usb - Remove TrackPoint name trailing whitespace

2012-07-06 19:12:17 -07:00

synaptics.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2012-10-02 17:16:10 -07:00

synaptics.h

Input: synaptics - print firmware ID and board number at init

2012-07-07 18:20:08 -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: trackpoint - use psmouse_fmt() for messages

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

trackpoint.h

Input: psmouse - use boolean type

2009-09-10 22:11:38 -07:00

vsxxxaa.c

Input: serio - use module_serio_driver

2012-04-04 09:25:43 -07:00