From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 17 Nov 2012 16:38:05 +0000 (+0000)
Subject: Merge branch 'vga.1' of git://git.kraxel.org/qemu
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ab4dd33dc3127a3830591b597a1f42be3686e1fd;p=qmiga%2Fqemu.git

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
---

ab4dd33dc3127a3830591b597a1f42be3686e1fd