]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce079ab ee6ee83)
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)
# 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>

Trivial merge
Qemu copy for testing