Merge remote-tracking branch 'lsk/v3.10/topic/iks' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 18 Jul 2013 15:42:36 +0000 (16:42 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 18 Jul 2013 15:42:36 +0000 (16:42 +0100)

Trivial merge