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)
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/phy/phy-generic.c


Trivial merge