]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'kraxel/chardev.7' into staging
authorAnthony Liguori <anthony@codemonkey.ws>
Tue, 17 Sep 2013 14:49:43 +0000 (09:49 -0500)
committerAnthony Liguori <anthony@codemonkey.ws>
Tue, 17 Sep 2013 14:49:44 +0000 (09:49 -0500)
commit25afd6eb150324c70164875853a9aede08c48aff
tree0f4b0269cd5bd39ce3801125f10ccb42efc2ccc4
parent7f87af39dc786a979e7ebba338d0781e366060ed
parentb0d768c35e08d2057b63e8e77e7a513c447199fa
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