Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc