From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 12 Jun 2017 18:26:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/elmarco/tags/char-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9bba618f18b1a60a3f2668db82b453f6cd9467c0;p=qemu.git

Merge remote-tracking branch 'remotes/elmarco/tags/char-pull-request' into staging

# gpg: Signature made Thu 08 Jun 2017 15:12:11 BST
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/char-pull-request:
  test-char: start a /char/serial test
  chardev: don't use alias names in parse_compat()
  char: fix alias devices regression

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

9bba618f18b1a60a3f2668db82b453f6cd9467c0