summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop',...Jiri Kosina2015-02-091-37/+13
|\ \
| | * HID: Use Kbuild idiom in MakefilesMichal Marek2015-01-211-37/+12
| |/ |/|
| * HID: add BETOP game controller force feedback supportHuang Bo2014-12-221-0/+1
|/
*-. Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid', 'for-3.19/lenov...Jiri Kosina2014-12-121-0/+2
|\ \
| | * HID: plantronics: fix errant mouse eventsJD Cole2014-11-031-0/+1
| |/ |/|
| * HID: Introduce hidpp, a module to handle Logitech hid++ devicesBenjamin Tissoires2014-10-291-0/+1
|/
* HID: add support for PenMount HID TouchScreen DriverChristian Gmeiner2014-09-041-0/+1
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2014-08-081-1/+3
|\
| * Input: HID - remove hid-wacom Bluetooth driverBenjamin Tissoires2014-08-061-2/+1
| * Input: wacom - move the USB (now hid) Wacom driver in drivers/hidBenjamin Tissoires2014-07-251-0/+3
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cool...Linus Torvalds2014-08-071-0/+1
|\ \
| * | HID: add support for MSI GT683R led panelsJanne Kanniainen2014-07-011-0/+1
| |/
* / HID: lenovo: Rename hid-lenovo-tpkbd to hid-lenovoJamie Lentin2014-07-291-1/+1
|/
* HID: rmi: introduce RMI driver for Synaptics touchpadsBenjamin Tissoires2014-04-091-0/+1
* HID: add hid-cp2112 driverDavid Barksdale2014-02-171-0/+1
* HID: roccat: add support for Ryos MK keyboardsStefan Achatz2013-10-301-1/+1
* HID: Add new driver for non-compliant Xin-Mo devices.Olivier Scherler2013-07-291-0/+1
*-. Merge branches 'for-3.11/wacom-fixed' and 'for-3.11/wiimote' into for-linusJiri Kosina2013-07-041-4/+1
|\ \
| | * HID: wiimote: remove old static extension supportDavid Herrmann2013-06-031-3/+0
| | * HID: wiimote: add sub-device module infrastructureDavid Herrmann2013-06-031-1/+1
| |/
| |
| \
| \
| \
*---. \ Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream'...Jiri Kosina2013-07-041-1/+1
|\ \ \ \ | | |_|/ | |/| |
| | | * HID: add support for Huion 580 tabletMartin Rusko2013-05-281-0/+1
| | |/ | |/|
| | * HID: fold ps3remote driver into generic Sony driverJiri Kosina2013-06-131-1/+0
| |/
| |
| \
*-. \ Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for...Jiri Kosina2013-07-041-0/+2
|\ \ \ | |_|/ |/| |
| | * HID: Add driver for Holtek gaming mouse 04d9:a067Christian Ohm2013-05-281-0/+1
| |/ |/|
| * HID: add driver for ELO 4000/4500Jiri Slaby2013-05-291-0/+1
|/
*-. Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstrea...Jiri Kosina2013-04-301-2/+2
|\ \
| * | HID: roccat: add support for Roccat Kone Pure gaming mouseStefan Achatz2013-03-141-2/+2
| |/
* / HID: appleir: add support for Apple ir devicesBenjamin Tissoires2013-04-181-0/+1
|/
*-. Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linusJiri Kosina2013-02-211-0/+1
|\ \
| | * HID: steelseries: rename driver to be compliant with other driversJiri Kosina2013-01-311-1/+1
| | * USB: HID: SRW-S1 Gaming Wheel DriverSimon Wood2013-01-311-0/+1
| |/
* / HID: add ThingM blink(1) USB RGB LED supportVivien Didelot2013-02-191-0/+1
|/
*---. Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid',...Jiri Kosina2012-12-121-2/+4
|\ \ \
| | | * HID: Add driver for ION iCadeBastien Nocera2012-10-311-0/+1
| |_|/ |/| |
| | * HID: roccat: add support for Roccat LuaStefan Achatz2012-10-171-2/+2
| |/ |/|
| * HID: i2c-hid: introduce HID over i2c specification implementationBenjamin Tissoires2012-11-191-0/+1
|/
* Merge tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-10-011-0/+1
|\
| * HID: sensors: introduce sensor frameworksrinivas pandruvada2012-09-061-0/+1
| |
| \
*-. \ Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogi...Jiri Kosina2012-10-011-0/+21
|\ \ \ | |_|/ |/| |
| | * HID: Add support for Sony PS3 BD Remote ControlDavid Dillow2012-10-011-0/+1
| |/ |/|
| * HID: picoLCD: split driver codeBruno Prémont2012-08-151-0/+20
|/
* Merge branch 'uhid' into for-linusJiri Kosina2012-07-241-0/+1
|\
| * HID: uhid: introduce user-space I/O driver support for HIDDavid Herrmann2012-06-181-0/+1
| |
| \
*-. \ Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes...Jiri Kosina2012-07-241-1/+4
|\ \ \ | |_|/ |/| |
| | * HID: Add driver for Holtek based keyboards with broken HIDTom Harwood2012-07-121-0/+1
| | * HID: Driver for Lenovo Keyboard with TrackpointBernhard Seibold2012-06-081-0/+1
| |/ |/|
| * HID: roccat: add support for Roccat SavuStefan Achatz2012-06-281-1/+2
|/
* Merge branch 'upstream' into for-linusJiri Kosina2012-05-221-0/+1
|\
| * HID: Aureal Remote Control Device DriverJosenivaldo Benito Junior2012-04-131-0/+1