Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 8 Aug 2013 21:02:25 +0000 (22:02 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 8 Aug 2013 21:02:25 +0000 (22:02 +0100)

Trivial merge