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