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