Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Tue, 3 Mar 2015 09:34:14 +0000 (09:34 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 3 Mar 2015 09:34:14 +0000 (09:34 +0000)

Trivial merge