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