Merge branch 'nop-phy-rename' into next
authorFelipe Balbi <balbi@ti.com>
Fri, 9 Aug 2013 14:31:23 +0000 (17:31 +0300)
committerFelipe Balbi <balbi@ti.com>
Fri, 9 Aug 2013 14:31:23 +0000 (17:31 +0300)
commit9e5f9c8aa85da01a7474655dc6af43b5985ad56a
tree15ceace09b484a2b351bd26587784cc169a702f0
parentd07f4a8200cfc7ff2ba23ef87dd6267a4d70fb10
parent3fa4d7344be0afebd80382ffeea6b1787cccf971
Merge branch 'nop-phy-rename' into next

Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/phy/phy-generic.c
drivers/usb/dwc3/dwc3-exynos.c
drivers/usb/dwc3/dwc3-pci.c
drivers/usb/musb/am35x.c
drivers/usb/musb/blackfin.c
drivers/usb/musb/da8xx.c
drivers/usb/musb/davinci.c
drivers/usb/musb/musb_dsps.c
drivers/usb/musb/tusb6010.c
drivers/usb/phy/phy-generic.c