Merge tag 'v3.10.46' into linux-linaro-lsk