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