From: Keith Busch <keith.busch@intel.com>
Date: Mon, 8 Aug 2016 15:54:48 +0000 (-0600)
Subject: Merge branch 'master' of https://github.com/linux-nvme/nvme-cli
X-Git-Tag: v0.9~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2169c35f3e3457ca9596a5f24c47059f45852965;p=users%2Fsagi%2Fnvme-cli.git

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

2169c35f3e3457ca9596a5f24c47059f45852965