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 Torvalds2012-03-231-0/+1
|\
| * Merge tag 'v3.3' into staging/for_v3.4Mauro Carvalho Chehab2012-03-191-0/+3
| |\
| * | [media] hid-core: ignore the Keene FM transmitterHans Verkuil2012-02-141-0/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-03-221-0/+11
|\ \ \
| * | | Merge commit 'v3.3-rc6' into nextDmitry Torokhov2012-03-091-7/+38
| |\| |
| * | | Input: add Synaptics USB device driverJan Steinhoff2012-02-031-0/+11
* | | | Merge branch 'upstream' into for-linusJiri Kosina2012-03-201-0/+16
|\ \ \ \
| * | | | HID: multitouch: add PID for Fructel productAndreas Nielsen2012-03-201-0/+3
| * | | | HID: tivo: add support for BT-version (0x1200)Jiri Kosina2012-03-131-0/+1
| * | | | HID: waltop: Add support for tablet with PID 0038Nikolai Kondrashov2012-03-061-0/+1
| * | | | HID: kye: Add support for 3 tabletsNikolai Kondrashov2012-02-281-0/+3
| * | | | HID: correct PID for saitek PS1000Jiri Kosina2012-02-221-1/+1
| * | | | HID: add new driver for non-compliant Saitek devicesAndreas Hübner2012-02-221-0/+1
| * | | | HID: sjoy: Add device ID for Super Joy Box 3Sean Young2012-02-211-0/+1
| * | | | HID: Add quirk for CH Products FighterstickVille Ranki2012-02-211-0/+1
| * | | | HID: waltop: Add support for Waltop Q PadNikolai Kondrashov2012-02-071-0/+1
| * | | | HID: add support for tivo slide remoteJarod Wilson2012-02-061-0/+3
| * | | | HID: add extra hotkeys in Asus AIO keyboardsKeng-Yu Lin2012-02-021-0/+1
| | |/ / | |/| |
| | | |
| \ \ \
*-. \ \ \ Merge branches 'battery-scope', 'logitech' and 'multitouch' into for-linusJiri Kosina2012-03-201-1/+15
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| | * | HID: multitouch: add support for eGalax 0x722aBenjamin Tissoires2012-03-091-0/+1
| | * | HID: multitouch: add more eGalax devicesBenjamin Tissoires2012-03-061-0/+6
| | * | HID: multitouch: add new PID from IdeacomBenjamin Tissoires2012-03-061-0/+1
| | * | HID: multitouch: add support for Atmel maXTouch 03eb:2118Benjamin Tissoires2012-03-061-0/+1
| | * | HID: multitouch: add support of Panasonic multitouch panelsDenis Kovalev2012-02-211-1/+5
| | * | HID: multitouch: support Perixx PERIPAD 701Benjamin Tissoires2012-02-061-0/+1
| |/ /
* / / HID: usbhid: Add NOGET quirk for the AIREN Slim+ keyboardAlan Stern2012-02-271-0/+3
|/ /
* | Merge branch 'hid-battery' of git://git.kernel.org/pub/scm/linux/kernel/git/j...Jiri Kosina2012-01-091-0/+1
|\ \
| * | hid-input/battery: add FEATURE quirkJeremy Fitzhardinge2012-01-081-0/+1
| |/
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes'...Jiri Kosina2012-01-051-7/+37
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| | | | * HID: wacom: Initial driver for Wacom Intuos4 Wireless (Bluetooth)Przemo Firszt2011-11-131-0/+1
| |_|_|/ |/| | |
| | * | HID: roccat: Add support for Isku keyboardStefan Achatz2011-12-061-0/+1
| | |/
| | * HID: Correct General touch PIDBenjamin Tissoires2011-11-231-1/+1
| |/ |/|
| * HID: hid-multitouch: add support 9 new Xiroku devicesMasatoshi Hoshikawa2012-01-051-0/+11
| * HID: multitouch: add support for 3M 32"Benjamin Tissoires2012-01-021-0/+1
| * HID: multitouch: add support of Atmel multitouch panelsBenjamin Tissoires2012-01-021-0/+3
| * HID: multitouch: support PixArt optical touch screenAaron Tian2011-12-151-0/+5
| * HID: hid-multitouch: add support for new Hanvon panelsBenjamin Tissoires2011-11-301-0/+3
| * HID: multitouch: merge quanta driver into hid-multitouchBenjamin Tissoires2011-11-301-1/+3
| * HID: multitouch: add support for the MSI Windpad 110WBenjamin Tissoires2011-11-231-0/+1
| * HID: multitouch: Add egalax ID for Acer Iconia W500Marek Vasut2011-11-231-0/+1
| * HID: multitouch: cleanup with eGalax PID definitionsBenjamin Tissoires2011-11-231-6/+6
| * HID: hid-multitouch - add another eGalax idChris Bagwell2011-11-231-0/+1
|/
* HID: hid-apple: add device ID of another wireless aluminiumAndreas Krist2011-10-281-0/+1
* HID: Add device IDs for Macbook Pro 8 keyboardsGökçen Eraslan2011-10-281-0/+3
* Merge branch 'upstream' into for-linusJiri Kosina2011-10-251-0/+12
|\
| * HID: Add device IDs for more SJOY adaptersSean Young2011-10-211-0/+3
| * HID: support primax keyboards violating USB HID specTerry Lambert2011-10-171-0/+3
| * HID: Add support MacbookAir 4,1 keyboardNobuhiro Iwamatsu2011-10-031-0/+3
| * HID: add support for MacBookAir4,2 keyboard.Joshua V. Dillon2011-08-101-0/+3
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into...Jiri Kosina2011-10-251-0/+9
|\ \ \ \ \ | | |_|_|/ | |/| | |