Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 11:56:03 +0000 (11:56 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 11:56:03 +0000 (11:56 +0000)

Trivial merge