Merge branch 'v3.10/topic/configs' into linux-linaro-lsk-v3.10