Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Thu, 22 Jan 2015 21:29:45 +0000 (21:29 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 22 Jan 2015 21:29:45 +0000 (21:29 +0000)

Trivial merge