projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fd3402 08bb4a7)
Merge remote-tracking branch 'afaerber-or/prep-up' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 15 Jan 2013 22:52:10 +0000 (16:52 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 15 Jan 2013 22:52:10 +0000 (16:52 -0600)
* 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>

Trivial merge
Domain: SDK / Emulator;