summary refs log tree commit diff stats
path: root/backends/hostmem-file.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-01-25 09:54:47 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-01-25 09:54:47 +0000
commit7d8df3272dfb2021380c5f1392c7508a111318d3 (patch)
treec22c84976174ca37c1a5ac4140362661084429e1 /backends/hostmem-file.c
parentfeff02089113839d233e40a9bd7134241de12d1d (diff)
parent285816d76f37c412f391fa14a2b28a35b7cb134e (diff)
downloadfocaccia-qemu-7d8df3272dfb2021380c5f1392c7508a111318d3.tar.gz
focaccia-qemu-7d8df3272dfb2021380c5f1392c7508a111318d3.zip
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging
- Some typo and UTF-8 fixes
- a ppc e6500 fix to remove duplicate SPR registering

# gpg: Signature made Thu 24 Jan 2019 12:48:05 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-patches-pull-request:
  hw/i386/pc.c: fix one typo in function name
  virtio-net: Fix a typo
  ppc: e6500 registers SPR 604 twice
  contrib/gitdm: Fix a typo
  MAINTAINERS: Fix utf-8 mangling

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'backends/hostmem-file.c')
0 files changed, 0 insertions, 0 deletions