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