aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-01-131-0/+17
|\
| * HID: hid-multitouch: minor fixes based on additional reviewBenjamin Tissoires2011-01-111-2/+8
| * HID: hid-mulitouch: add support for the 'Sensing Win7-TwoFinger'Benjamin Tissoires2011-01-111-0/+1
| * HID: hid-multitouch: add support for Cypress TrueTouch panelsBenjamin Tissoires2011-01-111-0/+1
| * HID: hid-multitouch: support for PixCir-based panelsBenjamin Tissoires2011-01-111-0/+9
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-01-101-0/+17
|\ \ | |/ |/|
| * HID: roccat: Add support for Roccat Kone[+] v2Stefan Achatz2011-01-081-0/+7
| * HID: Add Force Feedback support for EMS Trio Linker Plus IIIgnaz Forster2010-11-011-0/+10
* | hid: egalax: Document the new devices in KconfigHenrik Rydberg2010-12-161-1/+2
|/
* Merge branch 'waltop' into for-linusJiri Kosina2010-10-231-0/+6
|\
| * HID: add support for two Waltop tabletsNikolai Kondrashov2010-08-231-0/+6
* | Merge branch 'uc-logic' into for-linusJiri Kosina2010-10-231-0/+6
|\ \ | |/
| * HID: uclogic: fix up Kconfig entryJiri Kosina2010-08-091-1/+1
| * HID: Add support for UC-Logic WP????U tabletsNikolai Kondrashov2010-08-091-0/+6
| |
| \
| \
| \
*---. \ Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat'...Jiri Kosina2010-10-231-2/+17
|\ \ \ \ | | |_|/ | |/| |
| | | * HID: roccat: add driver for Roccat Pyra mouseStefan Achatz2010-09-011-0/+7
| | |/ | |/|
| | * HID: force feedback support for Logitech RumblePad gamepadHendrik Iben2010-10-041-2/+2
| | * HID: Add support for Logitech Speed Force Wireless gaming wheelSimon Wood2010-09-221-0/+8
| |/
* | HID: Kconfig: Complete Kconfig prompt namesBorislav Petkov2010-08-251-30/+30
|/
* Merge branch 'acrux' into for-linusJiri Kosina2010-08-041-0/+8
|\
| * HID: fix up Kconfig entry for ACRUX driverJiri Kosina2010-07-191-1/+0
| * HID: add ACRUX game controller force feedback supportSergei Kolzun2010-07-191-0/+9
* | Merge branch 'upstream-fixes' into for-linusJiri Kosina2010-08-041-2/+3
|\ \
| * | HID: Add support for Conceptronic CLLRCMCEKees Bakker2010-07-131-2/+3
| |/
* | Merge branch 'upstream' into for-linusJiri Kosina2010-08-041-0/+6
|\ \ | |/ |/|
| * HID: add proper support for Elecom BM084 bluetooth mouseRichard Nauber2010-06-281-0/+6
* | HID: roccat: fix modules interdependenciesRandy Dunlap2010-05-311-0/+1
* | HID: roccat: propagate special events of roccat hardware to userspaceStefan Achatz2010-05-251-0/+8
|/
* HID: fix up 'EMBEDDED' mess in KconfigJiri Kosina2010-05-211-31/+16
*-----. Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linusJiri Kosina2010-05-191-0/+79
|\ \ \ \
| | | | * HID: fixup Kconfig entry for Roccat KoneJiri Kosina2010-03-221-2/+1
| | | | * HID: add driver for Roccat Kone gaming mouseStefan Achatz2010-03-221-0/+7
| | |_|/ | |/| |
| | | * HID: make Prodikeys driver standalone config optionJiri Kosina2010-05-121-2/+1
| | | * HID: Prodikeys PC-MIDI HID DriverDon Prince2010-05-121-0/+16
| | |/ | |/|
| | * HID: hid-picolcd depends on LCD_CLASS_DEVICEBruno Prémont2010-04-111-9/+44
| | * HID: add experimental access to PicoLCD device's EEPROM and FLASHBruno Prémont2010-03-311-1/+1
| | * HID: add GPO (leds) support to PicoLCD deviceBruno Prémont2010-03-311-3/+3
| | * HID: add lcd support to PicoLCD deviceBruno Prémont2010-03-311-1/+1
| | * HID: add backlight support to PicoLCD deviceBruno Prémont2010-03-311-1/+1
| | * HID: add framebuffer support to PicoLCD deviceBruno Prémont2010-03-311-1/+6
| | * HID: new driver for PicoLCD deviceBruno Prémont2010-03-311-0/+18
| |/
* | Merge branch 'egalax' into for-linusJiri Kosina2010-05-191-0/+6
|\ \
| * | HID: add support for the eGalax dual-touch panelStephane Chatty2010-04-101-0/+6
| |/
* | Merge branch 'cando' into for-linusJiri Kosina2010-05-191-0/+6
|\ \
| * | HID: added support for the Cando dual touch panelStephane Chatty2010-04-151-0/+6
| |/
* | HID: hid-samsung: add support for Creative Desktop Wireless 6000Don Prince2010-05-171-1/+1
* | HID: Zydacron Remote Control driverDon Prince2010-05-171-0/+7
* | HID: add support for BTC Emprex 3009URF III Vista MCE RemoteWayne Thomas2010-04-291-1/+1
* | HID: expose wacom pen tablet battery through power_supply classPrzemo Firszt2010-03-161-0/+8
|/
* Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse'...Jiri Kosina2010-02-251-0/+9
|\