]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'kraxel/chardev.8' into staging
authorAnthony Liguori <anthony@codemonkey.ws>
Wed, 9 Oct 2013 14:52:11 +0000 (07:52 -0700)
committerAnthony Liguori <anthony@codemonkey.ws>
Wed, 9 Oct 2013 14:52:11 +0000 (07:52 -0700)
commitdfe22799751818115ed6d36bedc8a55b2026de3a
treeefb7a15719138c01ce9fbfcc3a9a2ee6ab136859
parentce079abb410d685d48c1285bc6749d9b23c78c5c
parentee6ee83de29923483b4905b35f18abf5333f6ea9
Merge remote-tracking branch 'kraxel/chardev.8' into staging

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/chardev.8:
  chardev: handle qmp_chardev_add(KIND_MUX) failure

Message-id: 1380708925-6721-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>