Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 11:33:35 +0000 (11:33 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 23 Jan 2015 11:33:35 +0000 (11:33 +0000)

Trivial merge