]> git.proxmox.com Git - qemu.git/commit - hw/fdc.c
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 47a150a 63e3555)
Merge remote-tracking branch 'afaerber-or/prep-up' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Jan 2013 14:23:16 +0000 (08:23 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Jan 2013 14:23:16 +0000 (08:23 -0600)
commit80ec24328607937690d0d620b99e8c24ab29e8f5
tree83d743935059a4508bd66752b83679684a31ac96tree
parent47a150a4bbb06e45ef439a8222e9f46a7c4cca3fcommit | diff
parent63e3555e80c31776285accbb4d0c14ae91c457dccommit | diff
Merge remote-tracking branch 'afaerber-or/prep-up' into staging

* afaerber-or/prep-up:
  prep: Use pc87312 device instead of collection of random ISA devices
  prep: Add pc87312 Super I/O emulation
  prep: Include devices for ppc64 as well

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Qemu copy for testing