Merge branch 'vga.1' of git://git.kraxel.org/qemu * 'vga.1' of git://git.kraxel.org/qemu: vga: fix mmio vga register mapping vga: fix bochs alignment issue