Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Fri, 31 Oct 2014 16:31:09 +0000 (16:31 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 31 Oct 2014 16:31:09 +0000 (16:31 +0000)

Trivial merge