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)
commita75f9b8beff402082cff34ff754eedea483f4bad
tree780a16df0f866eac86855dc1ef3181f9b001d794
parent0d18f973afa17a69b1a9341f7c6a655c259b774a
parent8816ee48f893b905eafbd78e76386394ee43686d
Merge remote-tracking branch 'lsk/v3.10/topic/usb' into linux-linaro-lsk

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