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