From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 8 Dec 2012 14:28:13 +0000 (+0000)
Subject: Merge branch 'memory-ioport' of git://github.com/afaerber/qemu-cpu
X-Git-Tag: v1.4.0-rc0~319
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c;p=thirdparty%2Fqemu.git

Merge branch 'memory-ioport' of git://github.com/afaerber/qemu-cpu

* 'memory-ioport' of git://github.com/afaerber/qemu-cpu:
  hw/dma.c: Replace register_ioport_*
  hw/pc.c: Replace register_ioport_*
  serial: Replace register_ioport_*
  hw/cirrus_vga.c: Replace register_ioport_*
  hw/apm.c: Replace register_ioport_*
  isa: Add isa_address_space_io()
---

4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c