Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf