Merge branch 'vga.1' of git://git.kraxel.org/qemu
commitab4dd33dc3127a3830591b597a1f42be3686e1fd
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 17 Nov 2012 16:38:05 +0000 (17 16:38 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 17 Nov 2012 16:38:05 +0000 (17 16:38 +0000)
treedf00e3eb08af8c6da6745acf62d085e2cda5f028
parent83eeb39669a19716a44bcad5a34158543b3779b8
parentc96c53b5f10c4b34e9fe1dcb1a5aadf204c16279
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