Linus, please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git for-linus to receive - 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 Alexey Klimov (2): HID: fix Masterkit MA901 hid quirks media: radio-ma901: return ENODEV in probe if usb_device doesn't match Benjamin Tissoires (1): HID: magicmouse: fix race between input_register() and probe() drivers/hid/hid-core.c | 13 ++++++++++++- drivers/hid/hid-ids.h | 5 ++--- drivers/hid/hid-magicmouse.c | 29 ++++++++++++++++++++--------- drivers/media/radio/radio-ma901.c | 11 +++++++++++ 4 files changed, 45 insertions(+), 13 deletions(-) Thanks, -- Jiri Kosina SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/