From: Anthony Liguori <aliguori@us.ibm.com>
Date: Wed, 16 Feb 2011 14:47:13 +0000 (-0600)
Subject: Merge remote branch 'kwolf/for-anthony' into staging
X-Git-Tag: pull-nvme-20200902~10386
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=79f2b6fcdb7c06cdce6eccc796f5651f3efb843e;p=qemu-nvme.git

Merge remote branch 'kwolf/for-anthony' into staging
---

79f2b6fcdb7c06cdce6eccc796f5651f3efb843e