Linaro fixes 4.7