summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-04 08:40:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-04 08:40:45 -0700
commit014642cb0a08d1b12c6089c48c7ba6002a0f6811 (patch)
treec4c3783d465bdd0c321f11996506bf17b90981c8 /include/linux
parent8d448270fee5675adf81df9e35c2ec341735558f (diff)
parentf1a9a149abc86903e81dd1b2e720f3f89874384b (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina: - Workaround for device ID conflict between Masterkit MA901 usb radio device and Atmel V-USB devices, to avoid regressions from older kernels, by Alexey Klimov - fix for possible race during input device registration in magicmouse driver, by Benjamin Tissoires * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: magicmouse: fix race between input_register() and probe() media: radio-ma901: return ENODEV in probe if usb_device doesn't match HID: fix Masterkit MA901 hid quirks
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions