projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitbdb8872cc14684557db4bef112b02eeb68f4410b
tree44bb5c69cc0ce9f47c3f328eef379a0353ea9883tree | snapshot
parent2fd3402d9242dec06bb1ca5680c1ddf421932b08commit | diff
parent08bb4a7c9bb9c12746bce9b3a1f031dd4192afc1commit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.