From: Peter Maydell Date: Thu, 11 Feb 2016 15:09:33 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-02-11' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fc1ec1acffd29d54c0c4266d30d38b2399d42f4f;p=qemu.git Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-02-11' into staging trivial patches for 2016-02-11 # gpg: Signature made Thu 11 Feb 2016 12:16:04 GMT using RSA key ID A4C3D7DB # gpg: Good signature from "Michael Tokarev " # gpg: aka "Michael Tokarev " # gpg: aka "Michael Tokarev " * remotes/mjt/tags/pull-trivial-patches-2016-02-11: w32: include winsock2.h before windows.h Adds keycode 86 to the hid_usage_keys translation table. s390x: remove s390-zipl.rom Passthru CCID card: QOMify Emulated CCID card: QOMify ES1370: QOMify char: fix parameter name / type in BSD codepath qmp-spec: fix index in doc rdma: remove check on time_spent when calculating mbs qemu-sockets: simplify error handling cpu: cpu_save/cpu_load is no more qom: Correct object_property_get_int() description man: virtfs-proxy-helper: Rework awkward sentence remove libtool support Signed-off-by: Peter Maydell --- fc1ec1acffd29d54c0c4266d30d38b2399d42f4f