Merge remote-tracking branch 'lsk/v3.10/topic/usb' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 20 Aug 2014 16:35:00 +0000 (11:35 -0500)
committerMark Brown <broonie@linaro.org>
Wed, 20 Aug 2014 16:35:00 +0000 (11:35 -0500)

Trivial merge