From: Keith Busch <keith.busch@intel.com>
Date: Thu, 3 Mar 2016 00:01:19 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/linux-nvme/nvme-cli
X-Git-Tag: v0.5~18
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bc4cd35099d8110d8cf5ba0a1f654d28b2c7cb0a;p=users%2Fsagi%2Fnvme-cli.git

Merge branch 'master' of https://github.com/linux-nvme/nvme-cli
---

bc4cd35099d8110d8cf5ba0a1f654d28b2c7cb0a