From: Anthony Liguori <aliguori@amazon.com>
Date: Wed, 11 Dec 2013 00:09:34 +0000 (-0800)
Subject: Merge remote-tracking branch 'mjt/trivial-patches' into staging
X-Git-Tag: v2.0.0-rc0~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45506cc2be6834196ac2773ec4267ca6780f17a1;p=thirdparty%2Fqemu.git

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

45506cc2be6834196ac2773ec4267ca6780f17a1