aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/Kconfig
Commit message (Expand)AuthorAge
*-. Merge branches 'for-3.10/multitouch', 'for-3.10/roccat' and 'for-3.10/upstrea...Jiri Kosina2013-04-30
|\ \
| | * HID: clarify Magic Mouse Kconfig descriptionDavid King2013-04-20
| | * HID: Kconfig: fix "-- help---"Paul Bolle2013-03-05
| |/
| |
| \
*-. \ Merge branches 'for-3.10/appleir', 'for-3.10/hid-debug', 'for-3.10/hid-driver...Jiri Kosina2013-04-30
|\ \ \ | | |/ | |/|
| | * HID: holtek: Holtek devices depends on USB_HIDBenjamin Tissoires2013-03-07
| | * HID: use hid_hw_wait() instead of direct call to usbhidBenjamin Tissoires2013-02-25
| | * HID: use hid_hw_request() instead of direct call to usbhidBenjamin Tissoires2013-02-25
| | * HID: Kconfig: Remove explicit transport layer dependenciesBenjamin Tissoires2013-02-25
| |/
* / HID: appleir: add support for Apple ir devicesBenjamin Tissoires2013-04-18
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2013-02-21
|\
| *-. Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linusJiri Kosina2013-02-21
| |\ \
| | | * HID: steelseries: rename driver to be compliant with other driversJiri Kosina2013-01-31
| | | * USB: HID: SRW-S1 Gaming Wheel DriverSimon Wood2013-01-31
| | |/
| * | HID: add ThingM blink(1) USB RGB LED supportVivien Didelot2013-02-19
| * | HID: add missing GENERIC_HARDIRQ dependencyHeiko Carstens2013-02-07
| |/
* | Merge branch 'master' into for-nextJiri Kosina2013-01-29
|\|
| *-. Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid',...Jiri Kosina2012-12-12
| |\ \
| | | * HID: remove spurious brackets for iCadeJiri Kosina2012-10-31
| | | * HID: Add driver for ION iCadeBastien Nocera2012-10-31
| | |/ | |/|
| | * HID: i2c-hid: introduce HID over i2c specification implementationBenjamin Tissoires2012-11-19
| |/
* / treewide: Replace incomming with incoming in all comments and stringsJorrit Schippers2013-01-03
|/
* Merge tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-10-01
|\
| * HID: sensors: introduce sensor frameworksrinivas pandruvada2012-09-06
* | Merge branch 'upstream' into for-linusJiri Kosina2012-10-01
|\ \
| * | HID: Remove "default m" from HID_LOGITECH_DJJosh Triplett2012-09-03
| |/
| |
| \
*-. \ Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogi...Jiri Kosina2012-10-01
|\ \ \ | |_|/ |/| |
| | * HID: Add support for Sony PS3 BD Remote ControlDavid Dillow2012-10-01
| |/ |/|
| * HID: picoLCD: split driver codeBruno Prémont2012-08-15
|/
* Merge branch 'uhid' into for-linusJiri Kosina2012-07-24
|\
| * HID: uhid: introduce user-space I/O driver support for HIDDavid Herrmann2012-06-18
| |
| \
| \
| \
*---. \ Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes...Jiri Kosina2012-07-24
|\ \ \ \
| | | * | HID: Add driver for Holtek based keyboards with broken HIDTom Harwood2012-07-12
| | | * | HID: select NEW_LEDS for driver of Lenovo ThinkPad USB Keyboard with TrackPointBryan Wu2012-06-18
| | | * | HID: Driver for Lenovo Keyboard with TrackpointBernhard Seibold2012-06-08
| | | |/
| | * / HID: hid-multitouch: add support for Zytronic panelsBenjamin Tissoires2012-06-28
| | |/
* | / HID: hid-multitouch: add support for Zytronic panelsBenjamin Tissoires2012-07-19
|/ /
* | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-06-26
|\ \
| * | HID: Fix the generic Kconfig optionsHenrik Rydberg2012-06-25
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-05-22
|\ \ | |/ |/|
| * Fix typo in various Kconfig fileMasanari Iida2012-04-16
| |
| \
| \
| \
*---. | Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linusJiri Kosina2012-05-22
|\ \ \|
| | * | HID: wacom: fix build breakage without CONFIG_LEDS_CLASSDavid Rientjes2012-05-21
| | * | HID: wacom: Add LED selector control for Wacom Intuos4 WLPrzemo Firszt2012-05-11
| | * | HID: wacom: Fix HID_WACOM self-dependencyPrzemo Firszt2012-03-29
| | * | HID: wacom: Change HID_WACOM option description.Przemo Firszt2012-03-28
| | * | HID: wacom: Remove CONFIG_HID_WACOM_POWER_SUPPLY optionPrzemo Firszt2012-03-28
| | |/
| * | HID: add Kconfig text to HID_BATTERY_STRENGTHJiri Kosina2012-04-24
* | | Merge branch 'upstream' into for-linusJiri Kosina2012-05-22
|\ \ \
| * | | HID: Aureal Remote Control Device DriverJosenivaldo Benito Junior2012-04-13
| | |/ | |/|
* | | HID: Create a common generic driverHenrik Rydberg2012-05-01
| |/ |/|