projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.