Skip to content
Commit 9e5f9c8a authored by Felipe Balbi's avatar Felipe Balbi
Browse files

Merge branch 'nop-phy-rename' into next 



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

Conflicts:
	drivers/usb/phy/phy-generic.c
parents d07f4a82 3fa4d734
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment