Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...
authorMark Brown <broonie@kernel.org>
Mon, 8 Sep 2014 10:35:48 +0000 (11:35 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 8 Sep 2014 10:35:48 +0000 (11:35 +0100)

Trivial merge