From: Anthony Liguori Date: Fri, 11 Jan 2013 14:23:16 +0000 (-0600) Subject: Merge remote-tracking branch 'afaerber-or/prep-up' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=80ec24328607937690d0d620b99e8c24ab29e8f5;p=qemu.git 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 --- 80ec24328607937690d0d620b99e8c24ab29e8f5