From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 15 Jan 2013 22:52:10 +0000 (-0600)
Subject: Merge remote-tracking branch 'afaerber-or/prep-up' into staging
X-Git-Tag: pull-xen-20190110~5524
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bdb8872cc14684557db4bef112b02eeb68f4410b;p=people%2Faperard%2Fqemu-dm.git

Merge remote-tracking branch 'afaerber-or/prep-up' into staging

* afaerber-or/prep-up:
  pc87312: Avoid define conflict on mingw32
  pc87312: Replace register_ioport_*() with MemoryRegion

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

bdb8872cc14684557db4bef112b02eeb68f4410b