Merge branch 's390-for-upstream' of git://github.com/agraf/qemu