summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-...Jiri Kosina2011-05-231-30/+25
|\ \
| | * HID: Fix typo Keyoutch -> KeytouchStephen Boyd2011-03-221-1/+1
| | * HID: add support for Skycable 0x3f07 wireless presenterJiri Kosina2011-03-211-2/+9
| |/ |/|
| * HID: hid-multitouch: cosmetic changes, sort classes and devicesBenjamin Tissoires2011-05-231-5/+4
| * HID: hid-multitouch: add support for Unitec panelsBenjamin Tissoires2011-05-201-0/+1
| * HID: hid-multitouch: add support for Touch International panelsBenjamin Tissoires2011-05-201-0/+1
| * HID: hid-multitouch: add support for GoodTouch panelsBenjamin Tissoires2011-05-201-0/+1
| * HID: hid-multitouch: add support for CVTouch panelsBenjamin Tissoires2011-05-201-0/+1
| * HID: hid-multitouch: add support for ActionStar panelsBenjamin Tissoires2011-05-201-0/+1
| * HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch PlusBenjamin Tissoires2011-05-191-0/+1
| * HID: hid-multitouch: Add support for Lumio panelsBenjamin Tissoires2011-05-181-0/+1
| * HID: hid-multitouch: add support for Ilitek dual-touch panelAustin Zhang2011-05-091-0/+1
| * HID: hid-multitouch: merge hid-mosart into hid-multitouchBenjamin Tissoires2011-04-221-6/+1
| * HID: hid-multitouch: add support for PenMount dual-touch panelJohn Sung2011-04-221-0/+1
| * HID: hid-multitouch: migrate 3M PCT touch screens to hid-multitouchBenjamin Tissoires2011-03-241-6/+1
| * HID: hid-multitouch: migrate Cando dual touch panels to hid-multitouchBenjamin Tissoires2011-03-211-6/+1
| * HID: hid-multitouch: migrate support for Stantum panels to the unified driver.Benjamin Tissoires2011-03-211-6/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-03-181-12/+55
|\
| *-------. Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat...Jiri Kosina2011-03-171-11/+49
| |\ \ \ \ \
| | | | | | * HID: add support for Ortek PKB-1700Herton Ronaldo Krzesinski2011-03-171-2/+2
| | | |_|_|/ | | |/| | |
| | | | | * HID: ACRUX - activate the device immediately after bindingDmitry Torokhov2011-03-121-2/+8
| | | | | * HID: add support for Keytouch IEC 60945Jiri Kosina2011-02-171-0/+8
| | | | | * HID: add support for wireless remote LC Power model RC1000MCEChris Schlund2011-02-031-0/+6
| | | |_|/ | | |/| |
| | | | * HID: roccat: Add support for Kova[+] mouseStefan Achatz2011-02-031-0/+8
| | | | * HID: roccat: Introduce module hid-roccat-commonStefan Achatz2011-02-031-0/+7
| | | | * HID: roccat: Add support for Roccat Arvo keyboardStefan Achatz2011-01-201-0/+7
| | | |/ | | |/|
| | | * HID: merge hid-egalax into hid-multitouchRichard Nauber2011-03-141-7/+2
| | | * HID: hid-multitouch: introduce IrTouch Infrared USB deviceBenjamin Tissoires2011-01-311-0/+1
| | |/
| * | HID: update dragonrise Kconfig descriptionNikolai Kondrashov2011-02-011-1/+6
| |/
* | kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-201-32/+32
|/
* 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
|\
OpenPOWER on IntegriCloud