From: Anthony Liguori <anthony@codemonkey.ws>
Date: Wed, 9 Oct 2013 14:52:11 +0000 (-0700)
Subject: Merge remote-tracking branch 'kraxel/chardev.8' into staging
X-Git-Tag: v1.7.0-rc0~78
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dfe22799751818115ed6d36bedc8a55b2026de3a;hp=-c;p=qemu.git

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>
---

dfe22799751818115ed6d36bedc8a55b2026de3a