From: Felipe Balbi <balbi@ti.com>
Date: Fri, 9 Aug 2013 14:31:23 +0000 (+0300)
Subject: Merge branch 'nop-phy-rename' into next
X-Git-Tag: v3.12-rc1~186^2~77^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e5f9c8aa85da01a7474655dc6af43b5985ad56a;p=pandora-kernel.git

Merge branch 'nop-phy-rename' into next

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

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

9e5f9c8aa85da01a7474655dc6af43b5985ad56a
Reading git-diff-tree failed