Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@linaro.org>
Fri, 22 Nov 2013 13:57:31 +0000 (13:57 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 22 Nov 2013 13:57:31 +0000 (13:57 +0000)

Trivial merge