summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' into for-linusJiri Kosina2011-10-251-1/+12
|\
| * HID: Add device IDs for more SJOY adaptersSean Young2011-10-211-1/+5
| * HID: primax: remove spurious dependencyJiri Kosina2011-10-171-2/+1
| * HID: support primax keyboards violating USB HID specTerry Lambert2011-10-171-0/+8
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into...Jiri Kosina2011-10-251-5/+24
|\ \ \ \ \
| | | | * | HID: wiimote: Read wiimote battery charge levelDavid Herrmann2011-09-071-0/+1
| |_|_|/ / |/| | | |
| | | * | HID: hid-multitouch: Add LG Display Multitouch device.Jeff Brown2011-08-161-0/+1
| | | |/
| | * | HID: Add full support for Logitech Unifying receiversNestor Lopez Casado2011-09-151-0/+9
| | * | HID: make CONFIG_LOGIWHEELS_FF default to CONFIG_LOGITECH_FFJiri Kosina2011-08-101-0/+1
| | * | HID: lg4ff - Fix misleading info in KconfigMichal Malý2011-08-041-4/+11
| | |/
| * | HID: ACRUX - fix enabling force feedback supportSergei Kolzun2011-08-041-1/+1
| |/
* | HID: wiimote: Register led class devicesDavid Herrmann2011-08-231-0/+1
|/
*-. Merge branches 'roccat', 'upstream' and 'wiimote' into for-linusJiri Kosina2011-07-221-0/+28
|\ \
| | * HID: wiimote: Add Nintendo Wii Remote driver stubDavid Herrmann2011-07-111-0/+6
| | * HID: hid-multitouch: add support for Chunghwa multi-touch panelAustin Zhang2011-06-071-0/+1
| * | HID: hid-multitouch: add one new multitouch device's VID/PIDice chien2011-07-211-0/+1
| * | HID: add FF support for Holtek On Line Grip based gamepadsAnssi Hannula2011-06-271-0/+14
| * | HID: Add driver to fix Speedlink VAD Cezanne supportStefan Kriwanek2011-06-081-0/+6
| |/
* | HID: roccat: chang Kconfig menu to submenu for roccat devicesStefan Achatz2011-06-131-10/+7
|/
*-. 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
|\
OpenPOWER on IntegriCloud