From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 30 Jul 2012 14:59:38 +0000 (-0500)
Subject: Merge remote-tracking branch 'bonzini/nbd-next' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4dd533aa03d6844f61e95558d75d8dbec72d899c;p=qemu.git

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

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

4dd533aa03d6844f61e95558d75d8dbec72d899c