Merge pull request #381 from bdeyal/master

author Keith Busch <keith.busch@intel.com>

Fri, 29 Jun 2018 20:05:57 +0000 (14:05 -0600)

committer GitHub <noreply@github.com>

Fri, 29 Jun 2018 20:05:57 +0000 (14:05 -0600)
author Keith Busch <keith.busch@intel.com>
Fri, 29 Jun 2018 20:05:57 +0000 (14:05 -0600)
committer GitHub <noreply@github.com>
Fri, 29 Jun 2018 20:05:57 +0000 (14:05 -0600)
diff --cc nvme-ioctl.c
Simple merge
diff --cc nvme-ioctl.h
Simple merge
diff --cc nvme.c
Simple merge
author	Keith Busch <keith.busch@intel.com>
	Fri, 29 Jun 2018 20:05:57 +0000 (14:05 -0600)
committer	GitHub <noreply@github.com>
	Fri, 29 Jun 2018 20:05:57 +0000 (14:05 -0600)
		1	2
nvme-ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
nvme-ioctl.h	patch \|	diff1 \|	diff2 \|	blob \| history
nvme.c	patch \|	diff1 \|	diff2 \|	blob \| history