Merge remote-tracking branch 'lts/linux-3.10.y' into linux-linaro-lsk