Merge remote-tracking branch 'lsk/linux-linaro-lsk' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 11:59:17 +0000 (11:59 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 11:59:17 +0000 (11:59 +0000)

Trivial merge