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

Trivial merge