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)
# 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


Trivial merge