]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
Merge branch 'master' of https://github.com/linux-nvme/nvme-cli
authorKeith Busch <keith.busch@intel.com>
Mon, 8 Aug 2016 15:54:48 +0000 (09:54 -0600)
committerKeith Busch <keith.busch@intel.com>
Mon, 8 Aug 2016 15:54:48 +0000 (09:54 -0600)
1  2 
nvme.c

diff --cc nvme.c
Simple merge