From: Anthony Liguori <aliguori@amazon.com>
Date: Tue, 19 Nov 2013 21:00:52 +0000 (-0800)
Subject: Merge remote-tracking branch 'stefanha/block' into staging
X-Git-Tag: v1.7.0-rc1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ed34791696523522fa7e6a00301e0bf3a09ea29;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'stefanha/block' into staging

# By Andreas Färber
# Via Stefan Hajnoczi
* stefanha/block:
  qtest: Use -display none by default
---

4ed34791696523522fa7e6a00301e0bf3a09ea29