From: Peter Maydell Date: Sat, 17 Mar 2018 12:11:08 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=979454028cf93e5ef340569c616f477fa7c8630a;p=qemu.git Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging PC compat bug fix for 2.12 # gpg: Signature made Fri 16 Mar 2018 19:30:25 GMT # gpg: using RSA key 2807936F984DC5A6 # gpg: Good signature from "Eduardo Habkost " # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/machine-next-pull-request: pc: correct misspelled CPU model-id for pc 2.2 Signed-off-by: Peter Maydell --- 979454028cf93e5ef340569c616f477fa7c8630a