summaryrefslogtreecommitdiffstats
path: root/drivers/hid
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'linus/master' into staging/for_v3.8Mauro Carvalho Chehab2012-11-286-34/+73
|\
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-11-161-3/+3
| |\
| | * HID: microsoft: do not use compound literal - fix buildJiri Slaby2012-11-121-3/+3
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-11-091-26/+43
| |\|
| | * HID: hidraw: put old deallocation mechanism in placeJiri Kosina2012-11-011-26/+43
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-10-315-8/+30
| |\|
| | * HID: Add support for the MacBook Pro 10,2 keyboard / touchpadDirk Hohndel2012-10-313-0/+15
| | * HID: multitouch: fix maxcontacts problem on GeneralTouchXianhan Yu2012-10-311-2/+1Star
| | * HID: multitouch: put the case in the right switch statementAlan Cox2012-10-311-1/+1
| | * HID: microsoft: fix invalid rdesc for 3k kbdJiri Slaby2012-10-311-5/+13
* | | [media] hid-picolcd_cir: fix compilationDavid Härdeman2012-10-311-1/+1
|/ /
* | Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2012-10-022-2/+2
|\ \ | |/ |/|
| * workqueue: deprecate system_nrt[_freezable]_wqTejun Heo2012-08-201-1/+1
| * workqueue: deprecate flush[_delayed]_work_sync()Tejun Heo2012-08-201-1/+1
* | Merge tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2012-10-015-0/+706
|\ \
| * | HID: hid-sensor-hub: Fix sensor_hub_probe error handlingAxel Lin2012-09-221-8/+4Star
| * | HID: hid-sensor-hub: Remove hdev->claimed settingAxel Lin2012-09-221-2/+0Star
| * | HID: sensors: remove some unneeded checksDan Carpenter2012-09-181-9/+0Star
| * | HID: sensors: use GFP_ATOMIC under spinlockDan Carpenter2012-09-181-2/+2
| * | HID: sensors: fix up for mfd_add_devices() API changeStephen Rothwell2012-09-181-1/+1
| * | Merge 3.6-rc6 into staging-nextGreg Kroah-Hartman2012-09-173-5/+8
| |\ \
| * | | HID: sensors: introduce sensor frameworksrinivas pandruvada2012-09-063-0/+710
| * | | HID: sensors: add to special driver listsrinivas pandruvada2012-09-062-0/+11
| | |/ | |/|
* | | Merge branch 'multitouch' into for-linusJiri Kosina2012-10-012-7/+65
|\ \ \
| * | | HID: multitouch: add support for GeneralTouch multi-touchscreenXianhan Yu2012-10-012-1/+18
| * | | HID: multitouch: Add ELAN production request when resume.Scott Liu2012-08-151-0/+27
| * | | HID: multitouch: Add support for eGalax 0x73f7Thierry Reding2012-08-152-0/+4
| * | | HID: hid-multitouch: Remove misleading null testHenrik Rydberg2012-08-151-6/+4Star
| * | | HID: multitouch: add support for Touch Revolution touchscreensJiri Kosina2012-08-152-0/+12
* | | | Merge branch 'upstream' into for-linusJiri Kosina2012-10-0131-229/+110Star
|\ \ \ \
| * | | | HID: keep dev_rdesc unmodified and use it for comparisonsKevin Daughtridge2012-10-012-6/+16
| * | | | HID: ntrig: change default value of logical/physical width/height to 1Wen-chien Jesse Sung2012-09-251-4/+4
| * | | | HID: roccat: conditional blacklisting of Roccat modulesStefan Achatz2012-09-171-0/+2
| * | | | HID: Fix return values in open_collection()Sachin Kamat2012-09-171-3/+3
| * | | | HID: lenovo-tpkbd: Remove unnecessary casts of void pointersAxel Lin2012-09-171-114/+33Star
| * | | | HID: prodikeys: Remove unnecessary casts of void pointersAxel Lin2012-09-171-9/+9
| * | | | HID: lg4ff: Remove unnecessary casts of void pointersAxel Lin2012-09-171-2/+2
| * | | | HID: lg: Remove unnecessary casts of void pointersAxel Lin2012-09-171-5/+5
| * | | | HID: holtekff: use %*ph to dump small buffersAndy Shevchenko2012-09-101-2/+1Star
| * | | | HID: primax: Remove px_probe() and px_remove() functionsAxel Lin2012-09-071-25/+0Star
| * | | | HID: waltop: Remove waltop_probe() and waltop_remove() functionsAxel Lin2012-09-071-29/+0Star
| * | | | HID: hid-lcpower: Use HID_UP_LOGIVENDOR instead of hard coded 0x0ffbc0000Axel Lin2012-09-051-1/+1
| * | | | HID: remove Paul Walmsley's copyright from places where it shouldn't beJiri Kosina2012-09-0517-17/+0Star
| * | | | HID: Remove "default m" from HID_LOGITECH_DJJosh Triplett2012-09-031-1/+0Star
| * | | | HID: update hid_have_special_driver[] explanationJiri Kosina2012-09-021-1/+8
| * | | | Merge branch 'master' into upstreamJiri Kosina2012-08-272-1/+2
| |\ \ \ \
| * | | | | HID: hid-debug: Show rdesc for unclaimed devicesHenrik Rydberg2012-08-271-3/+9
| * | | | | HID: Remove duplicate ID for QUANTA 3001 touchscreenSimon Farnsworth2012-08-272-2/+1Star
| * | | | | HID: hidraw: improve error handling in hidraw_init()Alexey Khoroshilov2012-08-151-4/+11
| * | | | | HID: add quirk for Freescale i.MX28 ROM recoveryMarek Vasut2012-08-152-0/+4