Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...
authorMark Brown <broonie@kernel.org>
Fri, 20 Feb 2015 05:27:48 +0000 (14:27 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 20 Feb 2015 05:27:48 +0000 (14:27 +0900)

Trivial merge