From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 2 May 2012 19:49:53 +0000 (-0500)
Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=58a331bab950e9a12da8b17b57e11927893eaf5e;p=qemu.git

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

* kwolf/for-anthony:
  ATA: Allow WIN_SECURITY_FREEZE_LOCK as nop
  rbd: add discard support
  qcow2: fix the return value -ENOENT -> -EEXIST
  qcow2: Don't hold cache references across yield
  qcow2: Remove unused parameter in do_alloc_cluster_offset
  qemu-iotests: Many parallel allocating I/O requests
  docs: fix one issue in qcow2 specs
  block/qcow2: Add missing GCC_FMT_ATTR to function report_unsupported()
  qemu-iotests: ignore fragmentation information for qed
---

58a331bab950e9a12da8b17b57e11927893eaf5e