Linaro changes