diff options
| author | Peter Maydell | 2015-06-02 12:25:12 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-02 12:25:12 +0200 |
| commit | 25611aa12b4155937d076dbe7445daed62ee6043 (patch) | |
| tree | 16aabd7403882e8c99f51d1333b2c63862ab378a /hw/misc/macio/macio.c | |
| parent | Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (diff) | |
| parent | virtio-input: make virtio devices follow usual naming convention (diff) | |
| download | qemu-25611aa12b4155937d076dbe7445daed62ee6043.tar.gz qemu-25611aa12b4155937d076dbe7445daed62ee6043.tar.xz qemu-25611aa12b4155937d076dbe7445daed62ee6043.zip | |
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>
Diffstat (limited to 'hw/misc/macio/macio.c')
0 files changed, 0 insertions, 0 deletions