]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'mjt/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 17 Jun 2013 13:57:07 +0000 (08:57 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 17 Jun 2013 13:57:07 +0000 (08:57 -0500)
commitb7a3b1cde2127f70d9fc24b7c99fbbc3899afab5
tree43b5b2ddf4eb32a0c25ba4ccaab9d81e9eea057d
parent030b4b7debf659dcd6fc66826564285fdce5057d
parentb165b0d8e62bb65a02d7670d75ebb77a9280bde1
Merge remote-tracking branch 'mjt/trivial-patches' into staging

# By Michael Tokarev (1) and Vladimir Senkov (1)
# Via Michael Tokarev
* mjt/trivial-patches:
  char/serial: fix copy&paste error (fifo8_is_full vs empty)
  vl: always define no_frame

Message-id: 1371455050-9523-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>