summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-ids.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-02-241-0/+3
|\
| * [hid] usb hid quirks for Masterkit MA901 usb radioAlexey Klimov2012-12-281-0/+3
| |
| \
*-. \ Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linusJiri Kosina2013-02-211-0/+4
|\ \ \
| | * | USB: HID: SRW-S1 Gaming Wheel DriverSimon Wood2013-01-311-0/+3
| | |/
| * / HID: add support for Sony RF receiver with USB product id 0x0374Fernando Luis Vázquez Cao2013-01-151-0/+1
| |/
| |
| \
| \
| \
*---. \ Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'fo...Jiri Kosina2013-02-211-1/+16
|\ \ \ \
| | | * | HID: add ThingM blink(1) USB RGB LED supportVivien Didelot2013-02-191-0/+3
| | | * | HID: blacklist Velleman data acquisition boardsIan Abbott2013-02-181-0/+6
| | | * | HID: Support Jess/Saitek Color Rumble PadMichael Karcher2013-01-171-0/+3
| | | |/
| | * / HID: multitouch: add support for Nexio 42" panelBenjamin Tissoires2013-02-051-0/+3
| |/ / |/| |
| * | HID: Correct Logitech order in hid-ids.hSimon Wood2013-02-201-1/+1
|/ /
* / HID: usbhid: quirk for Formosa IR receiverNicholas Santos2013-01-031-0/+3
|/
*-----. Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid',...Jiri Kosina2012-12-121-6/+12
|\ \ \ \
| | | | * HID: add quirk for Freescale i.MX23 ROM recoveryMarek Vasut2012-11-261-0/+3
| | | | * HID: usbhid: add quirk HID_QUIRK_NOGET to TPV optical touchscreenBenjamin Tissoires2012-11-151-0/+3
| | | | * HID: Ignore D-WAV/eGalax devices handled by usbtouchscreenForest Bond2012-11-071-0/+1
| | | | * HID: Add driver for ION iCadeBastien Nocera2012-10-311-0/+3
| | | * | Revert "HID: sensors: add to special driver list"Alexander Holler2012-12-121-6/+0
| | |/ / | |/| |
| | * | HID: roccat: add support for KoneXTDStefan Achatz2012-11-051-0/+1
| | * | HID: roccat: add support for Roccat LuaStefan Achatz2012-10-171-0/+1
| | |/
* | / HID: add support to novatec wireless mouseMarco Biscaro2012-11-221-0/+1
|/ /
* / HID: Add support for the MacBook Pro 10,2 keyboard / touchpadDirk Hohndel2012-10-311-0/+3
|/
* Merge tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-10-011-0/+6
|\
| * HID: sensors: add to special driver listsrinivas pandruvada2012-09-061-0/+6
* | Merge branch 'multitouch' into for-linusJiri Kosina2012-10-011-0/+5
|\ \
| * | HID: multitouch: add support for GeneralTouch multi-touchscreenXianhan Yu2012-10-011-0/+1
| * | HID: multitouch: Add support for eGalax 0x73f7Thierry Reding2012-08-151-0/+1
| * | HID: multitouch: add support for Touch Revolution touchscreensJiri Kosina2012-08-151-0/+3
* | | Merge branch 'upstream' into for-linusJiri Kosina2012-10-011-2/+3
|\ \ \
| * | | HID: remove Paul Walmsley's copyright from places where it shouldn't beJiri Kosina2012-09-051-1/+0
| * | | Merge branch 'master' into upstreamJiri Kosina2012-08-271-0/+1
| |\ \ \ | | | |/ | | |/|
| * | | HID: Remove duplicate ID for QUANTA 3001 touchscreenSimon Farnsworth2012-08-271-1/+0
| * | | HID: add quirk for Freescale i.MX28 ROM recoveryMarek Vasut2012-08-151-0/+3
| | |/ | |/|
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
*-----. \ \ Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogi...Jiri Kosina2012-10-011-0/+3
|\ \ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | | | * HID: uclogic: Add support for UC-Logic TWHA60Nikolai Kondrashov2012-08-271-0/+1
| | |_|/ | |/| |
| | | * HID: Add support for Sony PS3 BD Remote ControlDavid Dillow2012-10-011-0/+2
| | |/ | |/|
* / | HID: hid-multitouch: Add Flatfrog supportHenrik Rydberg2012-09-191-0/+3
|/ /
* | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-07-311-0/+1
|\ \ | |/ |/|
| * [media] radio-shark: New driver for the Griffin radioSHARK USB radio receiverHans de Goede2012-07-301-0/+1
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes...Jiri Kosina2012-07-241-0/+12
|\ \ \ \ \
| | | | * | HID: add ASUS AIO keyboard model AK1DCyrus Lien2012-07-231-0/+1
| | | | * | HID: add support for Cypress barcode scanner 04B4:ED81Lionel Vaux2012-07-221-0/+1
| | | | * | HID: Add driver for Holtek based keyboards with broken HIDTom Harwood2012-07-121-0/+3
| | | | * | HID: Driver for Lenovo Keyboard with TrackpointBernhard Seibold2012-06-081-0/+3
| | | * | | HID: roccat: add support for Roccat SavuStefan Achatz2012-06-281-0/+1
| | |/ / / | |/| | |
| | * | | HID: hid-multitouch: add support for Zytronic panelsBenjamin Tissoires2012-06-281-0/+3
| | * | | HID: multitouch: add support for Novatek touchscreenAustin Hendrix2012-06-061-0/+3
| | |/ /
* | | | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-07-191-0/+6
|\ \ \ \
| * | | | HID: hid-multitouch: add support for Zytronic panelsBenjamin Tissoires2012-07-191-0/+3
| * | | | HID: add Sennheiser BTD500USB device supportFrank Kunz2012-07-091-0/+3
| |/ / /