diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-17 12:11:08 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-17 12:11:08 +0000 |
| commit | 979454028cf93e5ef340569c616f477fa7c8630a (patch) | |
| tree | 9fc7ae09ab5345176f97dbdb6d59e2f8dbab91ec /linux-user/main.c | |
| parent | 2bb39a657abeac3f33ab3298177fb27c35f5b50a (diff) | |
| parent | 0ab126f165b04cce4a6e641d6bfce2ffd8a7cf62 (diff) | |
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 <ehabkost@redhat.com>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/main.c')
0 files changed, 0 insertions, 0 deletions