From: Linus Torvalds Date: Fri, 11 May 2007 16:56:05 +0000 (-0700) Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5884c40668a928bba017eaf54e2eb3c01c8a98e6;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge branch 'upstream-fixes' of /linux/kernel/git/jikos/hid * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid: USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release() HID: add hooks for getkeycode() and setkeycode() methods HID: switch to using input_dev->dev.parent USB HID: Logitech wheel 0x046d/0xc294 needs HID_QUIRK_NOGET quirk USB HID: usb_buffer_free() cleanup USB HID: report descriptor of Cypress USB barcode readers needs fixup Bluetooth HID: HIDP - don't initialize force feedback USB HID: update CONFIG_USB_HIDINPUT_POWERBOOK description HID: add input mappings for non-working keys on Logitech S510 remote --- 5884c40668a928bba017eaf54e2eb3c01c8a98e6