Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:11:08 +0000 (13:11 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:11:08 +0000 (13:11 +0100)

Trivial merge