Merge remote-tracking branch 'lsk/v3.10/topic/usb' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 14 May 2014 17:52:03 +0000 (18:52 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 14 May 2014 17:52:03 +0000 (18:52 +0100)
Conflicts:
drivers/usb/phy/phy-ulpi.c


Trivial merge