Merge remote-tracking branch 'bonzini/nbd-next' into staging
commit4dd533aa03d6844f61e95558d75d8dbec72d899c
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 30 Jul 2012 14:59:38 +0000 (30 09:59 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 30 Jul 2012 14:59:38 +0000 (30 09:59 -0500)
tree18dbd2b12fe1375f3396a0f47b822b2439271724
parentd4a06f466ac476fedc927c8355c6a3e0a1c6ca42
parent39a5235cd7f367cce7be7b3f4d258452452e38e3
Merge remote-tracking branch 'bonzini/nbd-next' into staging

* bonzini/nbd-next:
  qemu-nbd: add --cache and --aio options
  qemu-nbd: reorganize help message