From: Anthony Liguori Date: Wed, 29 May 2013 13:12:53 +0000 (-0500) Subject: Merge remote-tracking branch 'kraxel/chardev.6' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=46a352a7d7a47b3733ae76c0a0906d6934f81fc0;p=qemu.git Merge remote-tracking branch 'kraxel/chardev.6' into staging # By Gerd Hoffmann # Via Gerd Hoffmann * kraxel/chardev.6: chardev: fix "info chardev" output Revert "chardev: Get filename for new qapi backend" Message-id: 1369722844-24345-1-git-send-email-kraxel@redhat.com Signed-off-by: Anthony Liguori --- 46a352a7d7a47b3733ae76c0a0906d6934f81fc0