From: Anthony Liguori <anthony@codemonkey.ws>
Date: Tue, 17 Sep 2013 14:49:43 +0000 (-0500)
Subject: Merge remote-tracking branch 'kraxel/chardev.7' into staging
X-Git-Tag: v1.7.0-rc0~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25afd6eb150324c70164875853a9aede08c48aff;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'kraxel/chardev.7' into staging

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/chardev.7:
  chardev: fix pty_chr_timer

Message-id: 1378972894-11185-1-git-send-email-kraxel@redhat.com
---

25afd6eb150324c70164875853a9aede08c48aff