Merge branch 'for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm