tree df00e3eb08af8c6da6745acf62d085e2cda5f028
parent 83eeb39669a19716a44bcad5a34158543b3779b8
parent c96c53b5f10c4b34e9fe1dcb1a5aadf204c16279
author Blue Swirl <blauwirbel@gmail.com> 1353170285 +0000
committer Blue Swirl <blauwirbel@gmail.com> 1353170285 +0000

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