summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' into for-linusJiri Kosina2012-05-221-0/+1
|\
| * HID: Aureal Remote Control Device DriverJosenivaldo Benito Junior2012-04-131-0/+1
* | HID: Create a common generic driverHenrik Rydberg2012-05-011-0/+2
|/
* Merge branch 'upstream' into for-linusJiri Kosina2012-03-201-0/+2
|\
| * HID: add new driver for non-compliant Saitek devicesAndreas Hübner2012-02-221-0/+1
| * HID: add support for tivo slide remoteJarod Wilson2012-02-061-0/+1
* | HID: roccat: Only one Kconfig entry for all roccat driversStefan Achatz2012-02-051-8/+3
|/
*-----. Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes'...Jiri Kosina2012-01-051-1/+9
|\ \ \ \
| | | | * HID: wiimote: Add debugfs support stubsDavid Herrmann2011-11-221-0/+3
| | | | * HID: wiimote: Add extension support stubDavid Herrmann2011-11-221-0/+3
| | | | * HID: wiimote: Rename driver to allow multiple source filesDavid Herrmann2011-11-221-0/+2
| | | |/
| | * / HID: roccat: Add support for Isku keyboardStefan Achatz2011-12-061-0/+1
| | |/
| * / HID: multitouch: merge quanta driver into hid-multitouchBenjamin Tissoires2011-11-301-1/+0
| |/
* | HID: hyperv: fixup Kconfig / Makefile entriesJiri Kosina2011-11-221-1/+1
* | HID: Move the hid-hyperv driver out of stagingK. Y. Srinivasan2011-11-221-0/+1
|/
* Merge branch 'upstream' into for-linusJiri Kosina2011-10-251-0/+1
|\
| * HID: support primax keyboards violating USB HID specTerry Lambert2011-10-171-0/+1
* | HID: Add full support for Logitech Unifying receiversNestor Lopez Casado2011-09-151-0/+1
* | HID: lg4ff - Fix misleading info in KconfigMichal Malý2011-08-041-1/+1
|/
*-. Merge branches 'roccat', 'upstream' and 'wiimote' into for-linusJiri Kosina2011-07-221-0/+3
|\ \
| | * HID: wiimote: Add Nintendo Wii Remote driver stubDavid Herrmann2011-07-111-0/+1
| |/ |/|
| * HID: add FF support for Holtek On Line Grip based gamepadsAnssi Hannula2011-06-271-0/+1
| * HID: Add driver to fix Speedlink VAD Cezanne supportStefan Kriwanek2011-06-081-0/+1
|/
* HID: hid-multitouch: merge hid-mosart into hid-multitouchBenjamin Tissoires2011-04-221-1/+0
* HID: hid-multitouch: migrate 3M PCT touch screens to hid-multitouchBenjamin Tissoires2011-03-241-1/+0
* HID: hid-multitouch: migrate Cando dual touch panels to hid-multitouchBenjamin Tissoires2011-03-211-1/+0
* HID: hid-multitouch: migrate support for Stantum panels to the unified driver.Benjamin Tissoires2011-03-211-1/+0
*-----. Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat...Jiri Kosina2011-03-171-2/+6
|\ \ \ \
| | | | * HID: ACRUX - activate the device immediately after bindingDmitry Torokhov2011-03-121-1/+1
| | | | * HID: add support for Keytouch IEC 60945Jiri Kosina2011-02-171-0/+1
| | | | * HID: add support for wireless remote LC Power model RC1000MCEChris Schlund2011-02-031-0/+1
| | |_|/ | |/| |
| | | * HID: roccat: Add support for Kova[+] mouseStefan Achatz2011-02-031-0/+1
| | | * HID: roccat: Introduce module hid-roccat-commonStefan Achatz2011-02-031-0/+1
| | | * HID: roccat: Add support for Roccat Arvo keyboardStefan Achatz2011-01-201-0/+1
| | |/ | |/|
| | * HID: merge hid-egalax into hid-multitouchRichard Nauber2011-03-141-1/+0
| |/
* / HID: rename hid-drff.c to hid-dr.cNikolai Kondrashov2011-02-011-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-01-131-0/+1
|\
| * HID: hid-multitouch: support for PixCir-based panelsBenjamin Tissoires2011-01-111-0/+1
* | HID: roccat: Add support for Roccat Kone[+] v2Stefan Achatz2011-01-081-0/+1
* | HID: Clean up makefile (-y instead of -objs)Tracey Dent2010-11-181-6/+6
* | HID: Add Force Feedback support for EMS Trio Linker Plus IIIgnaz Forster2010-11-011-0/+1
|/
* Merge branch 'waltop' into for-linusJiri Kosina2010-10-231-0/+1
|\
| * HID: add support for two Waltop tabletsNikolai Kondrashov2010-08-231-0/+1
* | Merge branch 'uc-logic' into for-linusJiri Kosina2010-10-231-0/+1
|\|
| * HID: Add support for UC-Logic WP????U tabletsNikolai Kondrashov2010-08-091-0/+1
| |
| \
*-. \ Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat'...Jiri Kosina2010-10-231-0/+4
|\ \ \ | |_|/ |/| |
| | * HID: roccat: add driver for Roccat Pyra mouseStefan Achatz2010-09-011-0/+1
| |/ |/|
| * HID: Add support for Logitech Speed Force Wireless gaming wheelSimon Wood2010-09-221-0/+3
|/
* Merge branch 'acrux' into for-linusJiri Kosina2010-08-041-0/+1
|\
| * HID: add ACRUX game controller force feedback supportSergei Kolzun2010-07-191-0/+1