From owner-svn-src-stable-9@FreeBSD.ORG  Wed Jun 26 00:09:04 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E2B79EAC;
 Wed, 26 Jun 2013 00:09:04 +0000 (UTC)
 (envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D53F01D61;
 Wed, 26 Jun 2013 00:09:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5Q094Ao007539;
 Wed, 26 Jun 2013 00:09:04 GMT
 (envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5Q0942H007538;
 Wed, 26 Jun 2013 00:09:04 GMT
 (envelope-from jimharris@svn.freebsd.org)
Message-Id: <201306260009.r5Q0942H007538@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 26 Jun 2013 00:09:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252223 - stable/9/sbin/nvmecontrol
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jun 2013 00:09:05 -0000

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);
 }
+