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