Merge 4.1-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:57:51 +0000 (10:57 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Jun 2015 17:57:51 +0000 (10:57 -0700)
commit19915e623458004547c1c2490b09bb923fe69337
treeb794a81ddf083ed08a5bb32820c2dd0121ed74b2
parent4e47dcf78d2fa0b6316b6d563a055fdcc93bd222
parentd4a4f75cd8f29cd9464a5a32e9224a91571d6649
Merge 4.1-rc7 into usb-next

This resolves a merge issue in musb_core.c and we want the fixes that
were in Linus's tree in this branch as well for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/phy/Kconfig
drivers/phy/phy-core.c
drivers/phy/phy-rcar-gen2.c
drivers/usb/dwc3/core.h
drivers/usb/gadget/function/f_fs.c
drivers/usb/gadget/udc/s3c2410_udc.c
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
drivers/usb/musb/musb_core.c
drivers/usb/phy/phy-ab8500-usb.c