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