summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell2014-03-13 18:19:14 +0100
committerPeter Maydell2014-03-13 18:19:14 +0100
commit4a9a1f49c58fb0cbdd17ad3de2cc682aad3230b8 (patch)
tree618cfa5f27f2ce9208f00eba7082af7d1ce43100 /include
parentMerge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff)
parentchar: restore read callback on a reattached (hotplug) chardev (diff)
downloadqemu-4a9a1f49c58fb0cbdd17ad3de2cc682aad3230b8.tar.gz
qemu-4a9a1f49c58fb0cbdd17ad3de2cc682aad3230b8.tar.xz
qemu-4a9a1f49c58fb0cbdd17ad3de2cc682aad3230b8.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-chardev-1' into staging
char: restore read callback on a reattached (hotplug) chardev # gpg: Signature made Thu 13 Mar 2014 10:29:34 GMT 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-chardev-1: char: restore read callback on a reattached (hotplug) chardev Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions