Merge branch 'zImage_fixes' of git://git.linaro.org/people/nico/linux into devel...