Merge remote-tracking branch 'kwolf/for-anthony' into staging
commit58a331bab950e9a12da8b17b57e11927893eaf5e
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 2 May 2012 19:49:53 +0000 (2 14:49 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 2 May 2012 19:49:53 +0000 (2 14:49 -0500)
tree91131b2d56bf984f5806182d9961400f5ff414e3
parent9bf6b71a719f62af726d5a1fa4d705cfd5623f14
parentd5b406d95b4259baf622f73e1ffad6ee144633b8
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