Merge tag 'usb-for-v4.1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

Felipe writes:

usb: generic resume timeout for v4.1

This part 2 pull request contains only the patches
which make sure everybody on linux uses the same
resume timeout value.

Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --cc drivers/usb/dwc2/hcd.c
Simple merge

diff --cc drivers/usb/host/ehci-hub.c
Simple merge

diff --cc drivers/usb/host/fotg210-hcd.c
Simple merge

diff --cc drivers/usb/host/fusbh200-hcd.c
Simple merge

diff --cc drivers/usb/host/isp116x-hcd.c
Simple merge

diff --cc drivers/usb/host/oxu210hp-hcd.c
Simple merge

diff --cc drivers/usb/host/r8a66597-hcd.c
Simple merge

diff --cc drivers/usb/host/sl811-hcd.c
Simple merge

diff --cc drivers/usb/host/uhci-hub.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc drivers/usb/isp1760/isp1760-hcd.c
Simple merge

diff --cc drivers/usb/musb/musb_virthub.c
Simple merge