Merge tag 'for-upstream' of git://repo.or.cz/qemu/kevin into staging