]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'mjt/trivial-patches' into staging
authorAnthony Liguori <aliguori@amazon.com>
Wed, 11 Dec 2013 00:09:34 +0000 (16:09 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Wed, 11 Dec 2013 00:09:34 +0000 (16:09 -0800)
commit45506cc2be6834196ac2773ec4267ca6780f17a1
treeb9a165449dd67c933d0df2d7ffd4a7e73502cfec
parent8f84271da83c0e9f92aa7c1c2d0d3875bf0a5cb8
parentb1829cdebe2c5cc0b445f2959dbdb63a48118b12
Merge remote-tracking branch 'mjt/trivial-patches' into staging

# By Stefan Weil
# Via Michael Tokarev
* mjt/trivial-patches:
  qxl: Add missing trace.h (fix broken build)

Message-id: 1386441094-9971-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@amazon.com>