From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 25 Jan 2019 09:54:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request'... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7d8df3272dfb2021380c5f1392c7508a111318d3;p=qemu.git

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>
---

7d8df3272dfb2021380c5f1392c7508a111318d3