Merge remote-tracking branch 'bonzini/nbd-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 30 Jul 2012 14:59:38 +0000 (09:59 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 30 Jul 2012 14:59:38 +0000 (09:59 -0500)
* bonzini/nbd-next:
  qemu-nbd: add --cache and --aio options
  qemu-nbd: reorganize help message


Trivial merge