From: Kevin Wolf <kwolf@redhat.com>
Date: Thu, 23 Oct 2014 17:55:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'mreitz/block' into queue-block
X-Git-Tag: v2.2.0-rc0~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4db399b8be286fe471bbc9edf8ec22d8feac4d4;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'mreitz/block' into queue-block

* mreitz/block:
  qemu-img: Print error if check failed
  block: char devices on FreeBSD are not behind a pager
---

d4db399b8be286fe471bbc9edf8ec22d8feac4d4