]> www.infradead.org Git - users/sagi/nvme-cli.git/commitdiff
Merge branch 'keith-fixes'
authorKeith Busch <keith.busch@intel.com>
Mon, 14 Mar 2016 17:10:54 +0000 (11:10 -0600)
committerKeith Busch <keith.busch@intel.com>
Mon, 14 Mar 2016 17:10:54 +0000 (11:10 -0600)
1  2 
nvme.c

diff --cc nvme.c
Simple merge