svn commit: r252223 - stable/9/sbin/nvmecontrol

[Jim Harris]

Author: jimharris
Date: Wed Jun 26 00:09:04 2013
New Revision: 252223
URL: http://svnweb.freebsd.org/changeset/base/252223

Log:
  Forced commit due to bad commit message in r252222.
  
  MFC:
  r240618, r240621, r240633, r240671, r240672, r240697, r240700, r241433,
  r241434, r241657, r241658, r241659, r241660, r241661, r241662, r241663,
  r241664, r241665, r241689, r242420, r243951, r244410, r244411, r244413,
  r244549, r245136, r247963, r248729, r248730, r248731, r248732, r248733,
  r248734, r248735, r248736, r248737, r248738, r248739, r248740, r248741,
  r248746, r248747, r248748, r248749, r248754, r248755, r248756, r248757,
  r248758, r248759, r248760, r248761, r248762, r248763, r248764, r248765,
  r248766, r248767, r248768, r248769, r248770, r248771, r248772, r248773,
  r248780, r248834, r248835, r248913, r248977, r249067, r249416, r249417,
  r249418, r249419, r249420, r249421, r249422, r249432
  
  Merge all NVMe-related changes since the original code was added to HEAD,
  including linking it into the build.
  
  Sponsored by:	Intel

Modified:
  stable/9/sbin/nvmecontrol/nvmecontrol.c

Modified: stable/9/sbin/nvmecontrol/nvmecontrol.c
==============================================================================
--- stable/9/sbin/nvmecontrol/nvmecontrol.c	Tue Jun 25 23:52:39 2013	(r252222)
+++ stable/9/sbin/nvmecontrol/nvmecontrol.c	Wed Jun 26 00:09:04 2013	(r252223)
@@ -705,3 +705,4 @@ main(int argc, char *argv[])
 
 	return (0);
 }
+