summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-dr.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-21 21:40:04 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-09-21 21:40:04 +0200
commit3cf0c6bd68915aee3b5827b960e485de201e42c1 (patch)
tree51a4301194ce3e6d13cd97949f922936b0330af6 /drivers/hid/hid-dr.c
parent[media] vpif: Fix compilation with allmodconfig (diff)
parentMerge tag 'media-v3.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadlinux-3cf0c6bd68915aee3b5827b960e485de201e42c1.tar.xz
linux-3cf0c6bd68915aee3b5827b960e485de201e42c1.zip
Merge remote-tracking branch 'linus/master' into patchwork
There are some patches that depends on media-v3.16-rc6. So, merge back from upstream before applying them. * linus/master: (1123 commits) drm/nouveau: ltc/gf100-: fix cbc issues on certain boards drm/bochs: add missing drm_connector_register call drm/cirrus: add missing drm_connector_register call staging: vt6655: buffer overflow in ioctl USB: storage: Add quirks for Entrega/Xircom USB to SCSI converters USB: storage: Add quirk for Ariston Technologies iConnect USB to SCSI adapter USB: storage: Add quirk for Adaptec USBConnect 2000 USB-to-SCSI Adapter USB: EHCI: unlink QHs even after the controller has stopped [SCSI] fix for bidi use after free [SCSI] fix regression that accidentally disabled block-based tcq [SCSI] libiscsi: fix potential buffer overrun in __iscsi_conn_send_pdu drm/radeon: Fix typo 'addr' -> 'entry' in rs400_gart_set_page drm/nouveau/runpm: fix module unload drm/radeon/px: fix module unload vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops drm/radeon: don't reset dma on r6xx-evergreen init drm/radeon: don't reset sdma on CIK init drm/radeon: don't reset dma on NI/SI init drm/radeon/dpm: fix resume on mullins drm/radeon: Disable HDP flush before every CS again for < r600 ...
Diffstat (limited to 'drivers/hid/hid-dr.c')
0 files changed, 0 insertions, 0 deletions