summaryrefslogtreecommitdiffstats
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 Torvalds2013-02-211-1/+17
|\
| *-. Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linusJiri Kosina2013-02-211-0/+6
| |\ \
| | | * HID: steelseries: rename driver to be compliant with other driversJiri Kosina2013-01-311-1/+1
| | | * USB: HID: SRW-S1 Gaming Wheel DriverSimon Wood2013-01-311-0/+6
| | |/
| * | HID: add ThingM blink(1) USB RGB LED supportVivien Didelot2013-02-191-0/+10
| * | HID: add missing GENERIC_HARDIRQ dependencyHeiko Carstens2013-02-071-1/+1
| |/
* | Merge branch 'master' into for-nextJiri Kosina2013-01-291-0/+11
|\|
| *-. Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid',...Jiri Kosina2012-12-121-0/+11
| |\ \
| | | * HID: remove spurious brackets for iCadeJiri Kosina2012-10-311-1/+1
| | | * HID: Add driver for ION iCadeBastien Nocera2012-10-311-0/+9
| | |/ | |/|
| | * HID: i2c-hid: introduce HID over i2c specification implementationBenjamin Tissoires2012-11-191-0/+2
| |/
* / treewide: Replace incomming with incoming in all comments and stringsJorrit Schippers2013-01-031-1/+1
|/
* Merge tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-10-011-0/+14
|\
| * HID: sensors: introduce sensor frameworksrinivas pandruvada2012-09-061-0/+14
* | Merge branch 'upstream' into for-linusJiri Kosina2012-10-011-1/+0
|\ \
| * | HID: Remove "default m" from HID_LOGITECH_DJJosh Triplett2012-09-031-1/+0
| |/
| |
| \
*-. \ Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogi...Jiri Kosina2012-10-011-1/+20
|\ \ \ | |_|/ |/| |
| | * HID: Add support for Sony PS3 BD Remote ControlDavid Dillow2012-10-011-1/+12
| |/ |/|
| * HID: picoLCD: split driver codeBruno Prémont2012-08-151-0/+8
|/
* Merge branch 'uhid' into for-linusJiri Kosina2012-07-241-0/+21
|\
| * HID: uhid: introduce user-space I/O driver support for HIDDavid Herrmann2012-06-181-0/+21
| |
| \
| \
| \
*---. \ Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes...Jiri Kosina2012-07-241-2/+17
|\ \ \ \
| | | * | HID: Add driver for Holtek based keyboards with broken HIDTom Harwood2012-07-121-2/+4
| | | * | HID: select NEW_LEDS for driver of Lenovo ThinkPad USB Keyboard with TrackPointBryan Wu2012-06-181-0/+1
| | | * | HID: Driver for Lenovo Keyboard with TrackpointBernhard Seibold2012-06-081-0/+12
| | | |/
| | * / HID: hid-multitouch: add support for Zytronic panelsBenjamin Tissoires2012-06-281-0/+1
| | |/
* | / HID: hid-multitouch: add support for Zytronic panelsBenjamin Tissoires2012-07-191-0/+1
|/ /
* | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-06-261-23/+20
|\ \
| * | HID: Fix the generic Kconfig optionsHenrik Rydberg2012-06-251-23/+20
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-05-221-1/+1
|\ \ | |/ |/|
| * Fix typo in various Kconfig fileMasanari Iida2012-04-161-1/+1
| |
| \
| \
| \
*---. | Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linusJiri Kosina2012-05-221-9/+7
|\ \ \|
| | * | HID: wacom: fix build breakage without CONFIG_LEDS_CLASSDavid Rientjes2012-05-211-1/+1
| | * | HID: wacom: Add LED selector control for Wacom Intuos4 WLPrzemo Firszt2012-05-111-0/+1
| | * | HID: wacom: Fix HID_WACOM self-dependencyPrzemo Firszt2012-03-291-1/+0
| | * | HID: wacom: Change HID_WACOM option description.Przemo Firszt2012-03-281-1/+1
| | * | HID: wacom: Remove CONFIG_HID_WACOM_POWER_SUPPLY optionPrzemo Firszt2012-03-281-7/+1
| | |/
| * | HID: add Kconfig text to HID_BATTERY_STRENGTHJiri Kosina2012-04-241-1/+5
* | | Merge branch 'upstream' into for-linusJiri Kosina2012-05-221-0/+6
|\ \ \
| * | | HID: Aureal Remote Control Device DriverJosenivaldo Benito Junior2012-04-131-0/+6
| | |/ | |/|
* | | HID: Create a common generic driverHenrik Rydberg2012-05-011-0/+12
| |/ |/|
* | HID: default HID_BATTERY_STRENGTH to noJosh Boyer2012-04-191-1/+1
|/
* Merge branch 'upstream' into for-linusJiri Kosina2012-03-201-4/+24
|\
| * HID: tivo: add support for BT-version (0x1200)Jiri Kosina2012-03-131-1/+1
| * HID: kye: Add support for 3 tabletsNikolai Kondrashov2012-02-281-3/+6
| * HID: add new driver for non-compliant Saitek devicesAndreas Hübner2012-02-221-0/+9
| * HID: use generic driver for Logitech Unifying receivers if !CONFIG_HID_LOGITE...Konstantin Khlebnikov2012-02-211-1/+3
| * HID: tivo: fix broken buildJiri Kosina2012-02-061-1/+1
| * HID: add support for tivo slide remoteJarod Wilson2012-02-061-0/+6
| |
| \
*-. | Merge branches 'roccat' and 'wacom' into for-linusJiri Kosina2012-03-201-51/+4
|\ \|