From: Mark Brown <broonie@linaro.org>
Date: Wed, 14 May 2014 17:52:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/usb' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~129^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a75f9b8beff402082cff34ff754eedea483f4bad;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/usb' into linux-linaro-lsk

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

a75f9b8beff402082cff34ff754eedea483f4bad