tree 15ceace09b484a2b351bd26587784cc169a702f0
parent d07f4a8200cfc7ff2ba23ef87dd6267a4d70fb10
parent 3fa4d7344be0afebd80382ffeea6b1787cccf971
author Felipe Balbi <balbi@ti.com> 1376058683 +0300
committer Felipe Balbi <balbi@ti.com> 1376058683 +0300

Merge branch 'nop-phy-rename' into next

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

Conflicts:
	drivers/usb/phy/phy-generic.c