summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-roccat-isku.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-23 04:28:21 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-23 04:28:21 +0200
commitf8712528ae0bfef50f30b1da3d58e22f4f007889 (patch)
tree77dffd5ac91fd75f5e87595adb31176fd2bf3f11 /drivers/hid/hid-roccat-isku.c
parentxhci: rework command timeout and cancellation, (diff)
parentusb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call. (diff)
downloadlinux-f8712528ae0bfef50f30b1da3d58e22f4f007889.tar.xz
linux-f8712528ae0bfef50f30b1da3d58e22f4f007889.zip
Merge tag 'usb-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes: usb: patches for v3.16 merge window Not a lot here during this merge window. Mostly we just have the usual miscellaneous patches (removal of unnecessary prints, proper dependencies being added to Kconfig, build warning fixes, new device ID, etc. Other than those, the only important new features are the new support for OS Strings which should help Linux Gadget Drivers behave better under MS Windows. Also Babble Recovery implementation for MUSB on AM335x. Lastly, we also have ARCH_QCOM PHY support though phy-msm. Signed-of-by: Felipe Balbi <balbi@ti.com> Conflicts: drivers/usb/phy/phy-mv-u3d-usb.c
Diffstat (limited to 'drivers/hid/hid-roccat-isku.c')
0 files changed, 0 insertions, 0 deletions