aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2011-01-075-107/+69
|\
| * hid: egalax: Add support for Wetab (726b)Andy Ross2010-12-183-0/+4
| * hid: egalax: Add support for Samsung NB30 netbookRichard Nauber2010-12-163-0/+4
| * hid: egalax: Document the new devices in KconfigHenrik Rydberg2010-12-161-1/+2
| * hid: egalax: Add support for WetabHenrik Rydberg2010-12-163-0/+4
| * hid: egalax: Convert to MT slotsHenrik Rydberg2010-12-161-63/+23
| * hid: egalax: Add event filteringHenrik Rydberg2010-12-161-6/+10
| * hid: egalax: Report zero as minimum pressureHenrik Rydberg2010-12-161-0/+1
| * hid: egalax: Correct for device resolution report errorHenrik Rydberg2010-12-161-0/+2
| * hid: egalax: Setup input device manuallyHenrik Rydberg2010-12-161-12/+22
| * input: mt: Move tracking and pointer emulation to input-mtHenrik Rydberg2010-12-161-28/+2
| * input: mt: Collect slots initialization codeHenrik Rydberg2010-12-161-4/+1
| * input: mt: Break out slots handlingHenrik Rydberg2010-12-161-0/+1
* | USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)Melchior FRANZ2010-12-212-0/+3
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-12-024-10/+16
|\ \
| * | HID: length resolution should be reported units/mmDmitry Torokhov2010-12-021-8/+11
| * | HID: add support for F430 Force Feedback WheelSimon Wood2010-11-292-0/+3
| * | HID: egalax: Use kzallocHenrik Rydberg2010-11-041-1/+1
| * | HID: Remove KERN_DEBUG from dbg_hid useJoe Perches2010-11-031-1/+2
* | | BKL: remove extraneous #include <smp_lock.h>Arnd Bergmann2010-11-172-2/+0
| |/ |/|
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-10-253-33/+84
|\ \ | |/ |/|
| * Input: hid-input - allow mapping unknown usagesDmitry Torokhov2010-09-151-4/+9
| * Input: hid-input - switch to using new keycode interfaceDmitry Torokhov2010-09-091-33/+70
| * Input: add support for Hanwang tabletsXing Wei2010-09-012-0/+9
* | HID: fix mismerge in hid-lgJiri Kosina2010-10-231-1/+1
* | Merge branch 'waltop' into for-linusJiri Kosina2010-10-236-6/+1118
|\ \
| * | HID: waltop: add support for Waltop Slim Tablet 12.1 inchNikolai Kondrashov2010-10-013-0/+210
| * | HID: rdesc parser: remove local item size limitNikolai Kondrashov2010-09-021-6/+0
| * | HID: waltop: comment on tablet modesNikolai Kondrashov2010-09-011-2/+27
| * | HID: waltop: fix Media Tablet 10.6 inch zoomingNikolai Kondrashov2010-09-011-3/+12
| * | HID: waltop: add Media Tablet 14.1 inch supportNikolai Kondrashov2010-09-014-0/+300
| * | HID: waltop: fix Media Tablet 10.6 inch scrollingNikolai Kondrashov2010-09-011-9/+11
| * | HID: add support for two Waltop tabletsNikolai Kondrashov2010-08-236-0/+572
* | | Merge branch 'uc-logic' into for-linusJiri Kosina2010-10-2322-56/+713
|\ \ \
| * | | HID: uclogic: add proper support for PF1209Nikolai Kondrashov2010-08-232-0/+223
| * | | HID: uclogic: fix coding styleNikolai Kondrashov2010-08-231-7/+4
| |/ /
| * | HID: uclogic: fix up Kconfig entryJiri Kosina2010-08-091-1/+1
| * | HID: Add support for UC-Logic WP????U tabletsNikolai Kondrashov2010-08-096-1/+418
| * | HID: Add Tablet Pick -> BTN_STYLUS2 mappingNikolai Kondrashov2010-08-091-0/+4
| * | HID: allow resizing and replacing report descriptorsNikolai Kondrashov2010-08-0916-54/+70
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
*---------. \ \ Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat'...Jiri Kosina2010-10-2317-213/+1703
|\ \ \ \ \ \ \ \
| | | | | | * | | HID: roccat: Normalized reported profile number for pyra button events.Stefan Achatz2010-09-011-1/+5
| | | | | | * | | HID: roccat: add driver for Roccat Pyra mouseStefan Achatz2010-09-016-0/+1161
| | | | | * | | | HID: ntrig: identify firmware versionRafi Rubin2010-09-081-0/+51
| | | | | * | | | HID: ntrig: a bit of whitespace cleanupRafi Rubin2010-08-301-9/+9
| | | | | |/ / /
| | | | * | | | HID: magicmouse: Adjust major / minor axes to scaleHenrik Rydberg2010-10-011-2/+2
| | | | * | | | HID: magicmouse: Use hid-input parsing rather than bypassing itMichael Poole2010-09-241-63/+18
| | | | * | | | HID: magicmouse: enable Magic Trackpad supportChase Douglas2010-09-033-39/+155
| | | | * | | | HID: magicmouse: simplify touch data bit manipulationChase Douglas2010-09-031-12/+13
| | | | * | | | HID: magicmouse: simplify multitouch feature requestChase Douglas2010-09-031-12/+4