Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorMark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:11:13 +0000 (13:11 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:11:13 +0000 (13:11 +0100)

Trivial merge