From: Greg Kroah-Hartman Date: Fri, 23 May 2014 02:28:21 +0000 (+0900) Subject: Merge tag 'usb-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... X-Git-Tag: firefly_0821_release~176^2~3465^2~37^2~171 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f8712528ae0bfef50f30b1da3d58e22f4f007889;p=firefly-linux-kernel-4.4.55.git Merge tag 'usb-for-v3.16' of git://git./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 Conflicts: drivers/usb/phy/phy-mv-u3d-usb.c --- f8712528ae0bfef50f30b1da3d58e22f4f007889