summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/function/u_hid.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget/function/u_hid.h')
0 files changed, 0 insertions, 0 deletions
h>parent413d37326700aaf708730b940b04192c36e13ef4 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov: "A fix for a crash in uinput, and a fix for build errors when HID-RMI is built-in but SERIO is a module" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: synaptics-rmi4 - select 'SERIO' when needed Input: uinput - fix crash when mixing old and new init style
Diffstat (limited to 'drivers/usb/serial/sierra.c')