From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 2 Jun 2015 10:25:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150602-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=25611aa12b4155937d076dbe7445daed62ee6043;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-20150602-1' into staging

virtio-input: two small fixups

# gpg: Signature made Tue Jun  2 09:32:51 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-input-20150602-1:
  virtio-input: make virtio devices follow usual naming convention
  virtio-input: const_le16 and const_le32 not build time constant

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

25611aa12b4155937d076dbe7445daed62ee6043