summary refs log tree commit diff stats
path: root/qobject/json-parser.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-12 19:40:43 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-12 19:40:44 +0000
commit1396156f50ddcfffc0e3127a005b3cdcf6fcee60 (patch)
tree4c81243662cc0872c67e689c4e05a456770f8f66 /qobject/json-parser.c
parentfb5fff15881ba7a002924b967eb211c002897983 (diff)
parentc7ac1ab0201d47d12b75e1c98d79869bcdad5732 (diff)
downloadfocaccia-qemu-1396156f50ddcfffc0e3127a005b3cdcf6fcee60.tar.gz
focaccia-qemu-1396156f50ddcfffc0e3127a005b3cdcf6fcee60.zip
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180312-pull-request' into staging
usbredir: reorder fields in USBRedirDevice to reduce padding

# gpg: Signature made Mon 12 Mar 2018 11:05:19 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20180312-pull-request:
  usbredir: reorder fields in USBRedirDevice to reduce padding

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