Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro...