Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...
authorMark Brown <broonie@kernel.org>
Wed, 12 Nov 2014 21:29:20 +0000 (21:29 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 12 Nov 2014 21:29:20 +0000 (21:29 +0000)

Trivial merge