From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 22 Aug 2012 18:01:05 +0000 (-0500)
Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7b2f89c435f895431d55b675dc412275c2069314;p=qemu.git

Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
  virtio-blk: hide VIRTIO_BLK_F_CONFIG_WCE from old machine types
  Documentation: Warn against qemu-img on active image
  vmdk: Read footer for streamOptimized images
  vmdk: Fix header structure

Conflicts:
	hw/virtio-blk.c
---

7b2f89c435f895431d55b675dc412275c2069314