Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Wed, 15 Jan 2014 23:09:42 +0000 (23:09 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 15 Jan 2014 23:09:42 +0000 (23:09 +0000)

Trivial merge