]> git.proxmox.com Git - qemu.git/commit - pc-bios/bios.bin
Merge remote-tracking branch 'kraxel/chardev.6' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 May 2013 13:12:53 +0000 (08:12 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 May 2013 13:12:53 +0000 (08:12 -0500)
commit46a352a7d7a47b3733ae76c0a0906d6934f81fc0
treeee0dfc06b1e636a8e2aae0d5fcb1b6bec571cc5e
parentc199707ad0dcbb4a72e7435551c7f23b9606a063
parent60d95386abf1f5f37ded6a812d12ac458df2491b
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 <aliguori@us.ibm.com>