Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...
authorMark Brown <broonie@kernel.org>
Tue, 13 Jan 2015 11:54:51 +0000 (11:54 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 13 Jan 2015 11:54:51 +0000 (11:54 +0000)

Trivial merge