summaryrefslogtreecommitdiffstats
path: root/drivers/hid/usbhid
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-10-251-4/+3
|\
| * Merge branch 'pm-runtime' into pm-for-linusRafael J. Wysocki2011-10-071-4/+3
| |\
| | * PM / Runtime: Add macro to test for runtime PM eventsAlan Stern2011-08-191-4/+3
* | | Merge branch 'upstream' into for-linusJiri Kosina2011-10-251-2/+0
|\ \ \
| * | | HID: Add device IDs for more SJOY adaptersSean Young2011-10-211-1/+0
| * | | IHD: Support force feedback on MP-8866Sean Young2011-08-151-1/+0
| | |/ | |/|
* | | HID: usbhid: cancel timer for retry synchronouslyOliver Neukum2011-10-131-1/+1
* | | HID: hiddev: potential info leak in hiddev_ioctl()Dan Carpenter2011-09-271-0/+2
| |/ |/|
* | HID: add support for HuiJia USB Gamepad connectorClemens Werther2011-08-251-0/+1
* | HID: usbhid: Add support for SiGma Micro chipJeremiah Matthey2011-08-231-0/+1
|/
*-. Merge branches 'roccat', 'upstream' and 'wiimote' into for-linusJiri Kosina2011-07-223-2/+9
|\ \
| | * HID: hiddev: fix use after free in hiddev_releaseDan Carpenter2011-05-261-1/+4
| | * HID: add quirk for HyperPen 10000UJimmy Hon2011-05-241-0/+1
| | * HID: hiddev: fix potential use-after-freeJiri Kosina2011-05-241-1/+2
| |/ |/|
| * HID: yurex: recognize GeneralKeys wireless presenter as generic HIDTomoki Sekiyama2011-06-071-0/+2
|/
*-. Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-...Jiri Kosina2011-05-232-20/+17
|\ \
| | * HID: hiddev: fix error path in hiddev_read when interruptedPeter Waechtler2011-04-291-1/+3
| | * HID: add support for barcode scanners from Symbol TechnologiesJiri Kosina2011-04-261-0/+2
| |/ |/|
| * HID: hiddev: fix race between hiddev_disconnect and hiddev_releaseJiri Kosina2011-05-201-2/+8
| * Merge branch 'master' into upstream.Jiri Kosina2011-05-181-0/+1
| |\
| | * HID: Add support for CH Pro ThrottleJiri Kosina2011-04-061-0/+1
| |/ |/|
| * HID: 'name' and 'phys' in 'struct hid_device' can never be NULLDaniel Mack2011-05-181-16/+2
| * HID: hiddev: fix brace indentDan Carpenter2011-03-271-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-03-181-0/+35
|\
| * HID: Add Support for Setting and Getting Feature Reports from hidrawAlan Ott2011-02-111-0/+35
* | kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-201-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-01-131-1/+0
|\
| * HID: Switch turbox/mosart touchscreen to hid-mosartBenjamin Tissoires2011-01-111-1/+0
* | HID: usbhid: base runtime PM on modern APIOliver Neukum2010-12-222-39/+19
* | Merge branch 'master' into upstreamJiri Kosina2010-12-101-1/+0
|\ \ | |/
| * BKL: remove extraneous #include <smp_lock.h>Arnd Bergmann2010-11-171-1/+0
* | HID: Add and use hid_<level>: dev_<level> equivalentsJoe Perches2010-12-104-123/+115
* | HID: Consolidate device existence checks in hiddev_ioctlValentine Barshak2010-12-071-184/+103
* | HID: Fix race between disconnect and hiddev_ioctlValentine Barshak2010-12-071-37/+131
* | HID: Add support for Perixx PERIBOARD-707 (Plus)Dennis Kügler2010-11-251-1/+1
* | HID: usbhid: Clean up makefile (-y instead of -objs)Tracey Dent2010-11-181-3/+3
|/
* Merge branch 'waltop' into for-linusJiri Kosina2010-10-231-0/+2
|\
| * HID: waltop: add Media Tablet 14.1 inch supportNikolai Kondrashov2010-09-011-0/+1
| * HID: add support for two Waltop tabletsNikolai Kondrashov2010-08-231-0/+1
* | Merge branch 'uc-logic' into for-linusJiri Kosina2010-10-231-0/+2
|\ \ | |/
| * HID: Add support for UC-Logic WP????U tabletsNikolai Kondrashov2010-08-091-1/+2
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat'...Jiri Kosina2010-10-232-2/+1
|\ \ \ \ \
| | | * | | HID: don't Send Feature Reports on Interrupt EndpointAlan Ott2010-09-221-1/+1
| | |/ / / | |/| | |
| | * | | HID: Fix for problems with eGalax/DWAV multi-touch-screenPhilipp Merkel2010-10-011-1/+0
| |/ / /
| | | |
| \ \ \
*-. \ \ \ Merge branches 'upstream' and 'upstream-fixes' into for-linusJiri Kosina2010-10-233-46/+2
|\ \ \ \ \ | | |/ / /
| * | | | HID: add NOGET quirk for AXIS 295 Video Surveillance JoystickRok Mandeljc2010-10-011-0/+1
| * | | | HID: usbhid: remove unused hiddev_driverAlan Stern2010-09-242-46/+0
| * | | | Merge branch 'master' into upstreamJiri Kosina2010-09-244-2/+13
| |\ \ \ \ | | |/ / /
| * | | | HID: trivial formatting fixAlan Ott2010-09-221-0/+1
| | |/ / | |/| |
* | | | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-221-0/+1
|\ \ \ \
OpenPOWER on IntegriCloud