Merge pull request #101 from samiWaheed/master

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

Wed, 13 Jul 2016 14:58:06 +0000 (08:58 -0600)

committer GitHub <noreply@github.com>

Wed, 13 Jul 2016 14:58:06 +0000 (08:58 -0600)
author Keith Busch <keith.busch@intel.com>
Wed, 13 Jul 2016 14:58:06 +0000 (08:58 -0600)
committer GitHub <noreply@github.com>
Wed, 13 Jul 2016 14:58:06 +0000 (08:58 -0600)
diff --cc nvme-print.c
Simple merge
diff --cc nvme-print.h
Simple merge
diff --cc nvme.c
Simple merge
author	Keith Busch <keith.busch@intel.com>
	Wed, 13 Jul 2016 14:58:06 +0000 (08:58 -0600)
committer	GitHub <noreply@github.com>
	Wed, 13 Jul 2016 14:58:06 +0000 (08:58 -0600)
		1	2
nvme-print.c	patch \|	diff1 \|	diff2 \|	blob \| history
nvme-print.h	patch \|	diff1 \|	diff2 \|	blob \| history
nvme.c	patch \|	diff1 \|	diff2 \|	blob \| history