summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'magicmouse', 'roccat' and 'vec-pedal' into for-linusJiri Kosina2010-08-049-62/+98
|\ \ \
| | | * HID: Force input registration for "VEC footpedal"Daniel Mack2010-07-192-0/+4
| | | * HID: add HID_QUIRK_HIDINPUT_FORCEDaniel Mack2010-07-191-0/+2
| | | * HID: hid-input.c: indentation fixesDaniel Mack2010-07-191-9/+9
| | * | HID: roccat: remove obsolete kone_abi_version sysfs attributeStefan Achatz2010-06-212-18/+0
| | * | HID: roccat: fix offset errors in bin_attribute readStefan Achatz2010-06-211-2/+2
| | * | HID: roccat: introduce missing kfreeJulia Lawall2010-06-021-3/+6
| | * | HID: roccat: change kone_driver_version to kone_abi_versionStefan Achatz2010-05-312-7/+7
| | * | HID: roccat: fix whitespace warning from checkpatch.plStefan Achatz2010-05-311-1/+1
| | * | HID: roccat: remove obsolete commentStefan Achatz2010-05-311-5/+0
| * | | HID: magicmouse: Correct parsing of large X and Y motions.Michael Poole2010-07-111-2/+2
| * | | HID: magicmouse: report last touch upChase Douglas2010-07-111-2/+20
| * | | HID: magicmouse: enable horizontal scrollingChase Douglas2010-06-241-6/+19
| * | | HID: magicmouse: add param for scroll speedChase Douglas2010-06-241-15/+28
| * | | HID: magicmouse: properly account for scroll movement in stateChase Douglas2010-06-241-1/+2
| * | | HID: magicmouse: disable and add module param for scroll accelerationChase Douglas2010-06-041-1/+7
| * | | HID: magicmouse: scroll on entire surface, not just middle of mouseChase Douglas2010-06-041-3/+2
| |/ /
* | | Merge branch 'acrux' into for-linusJiri Kosina2010-08-045-1/+187
|\ \ \
| * | | HID: fix up Kconfig entry for ACRUX driverJiri Kosina2010-07-191-1/+0
| * | | HID: add ACRUX game controller force feedback supportSergei Kolzun2010-07-195-0/+187
| | |/ | |/|
* | | Merge branch 'upstream-fixes' into for-linusJiri Kosina2010-08-045-8/+16
|\ \ \
| * | | Revert "HID: add support for the Wacom Intuos 4 wireless"Jiri Kosina2010-07-203-3/+1
| * | | HID: Add support for Conceptronic CLLRCMCEKees Bakker2010-07-134-2/+12
| |/ /
* | | Merge branch 'upstream' into for-linusJiri Kosina2010-08-048-74/+276
|\ \ \ | |/ / |/| |
| * | HID: ignore digitizer usage Undefined (0x00)Forest Bond2010-07-131-0/+3
| * | HID: hid-ids.h: Whitespace fixup, align using TABsKees Bakker2010-07-121-20/+20
| * | HID: picolcd: implement refcounting of framebufferBruno Prémont2010-07-121-7/+103
| * | HID: picolcd: do not reallocate memory on depth changeBruno Prémont2010-07-121-15/+12
| * | HID: picolcd: Add minimal palette required by fbcon on 8bppBruno Prémont2010-07-121-11/+51
| * | HID: picolcd: fix deferred_io init/cleanup to fb orderingBruno Prémont2010-07-111-2/+2
| * | HID: hid-ids.h: keep vendor ids in alphabetical orderKees Bakker2010-07-111-21/+21
| * | HID: add proper support for Elecom BM084 bluetooth mouseRichard Nauber2010-06-285-0/+68
| * | HID: remove unused variable from hidraw_readStefan Achatz2010-05-251-2/+0
* | | Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-07-1216-163/+167
|\ \ \
| * | | V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host driversLaurent Pinchart2010-07-117-110/+89
| * | | V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereferencePawel Osciak2010-07-081-0/+3
| * | | V4L/DVB: uvcvideo: Power line frequency control doesn't support GET_MIN/MAX/RESLaurent Pinchart2010-07-081-2/+2
| * | | V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a blank s...Ian Armstrong2010-07-081-0/+3
| * | | V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E tunerAndy Walls2010-07-081-0/+15
| * | | V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tunerAndy Walls2010-07-082-0/+17
| * | | V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargsVaibhav Hiremath2010-07-081-2/+2
| * | | V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contigVaibhav Hiremath2010-07-082-32/+16
| * | | V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changesVaibhav Hiremath2010-07-082-17/+20
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-07-127-5/+91
|\ \ \ \
| * | | | HID: Send Report ID when numbered reports are sent over the control endpoint.Alan Ott2010-07-111-3/+10
| * | | | HID: Enable HID_QUIRK_MULTI_INPUT for Retro AdaptorPeter Edwards2010-07-112-0/+3
| * | | | HID: add support for CH Eclipse yokeJonathan Rockway2010-07-112-0/+2
| * | | | HID: eliminate a double lock in debug codeJulia Lawall2010-06-211-1/+1
| * | | | HID: ntrig: add support for new firwmare versionsmicki2010-06-213-0/+72
| * | | | HID: check for HID_QUIRK_IGNORE during probingJindrich Makovicka2010-06-041-1/+2