From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 6 Jan 2012 14:15:39 +0000 (-0600)
Subject: Merge remote-tracking branch 'amit/master' into staging
X-Git-Tag: pull-nvme-20200902~8740
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f40b7d113d73d5ca1cdcbe6a4acc1be340a3751d;p=qemu-nvme.git

Merge remote-tracking branch 'amit/master' into staging

* amit/master:
  virtio-console: Fix failure on unconnected pty
---

f40b7d113d73d5ca1cdcbe6a4acc1be340a3751d