Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Thu, 4 Dec 2014 17:20:43 +0000 (17:20 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 4 Dec 2014 17:20:43 +0000 (17:20 +0000)

Trivial merge