tree 18dbd2b12fe1375f3396a0f47b822b2439271724
parent d4a06f466ac476fedc927c8355c6a3e0a1c6ca42
parent 39a5235cd7f367cce7be7b3f4d258452452e38e3
author Anthony Liguori <aliguori@us.ibm.com> 1343660378 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1343660378 -0500

Merge remote-tracking branch 'bonzini/nbd-next' into staging

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