From owner-svn-src-stable@FreeBSD.ORG  Tue May 19 18:14:05 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 43EBB106566C;
	Tue, 19 May 2009 18:14:05 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 30C098FC0A;
	Tue, 19 May 2009 18:14:05 +0000 (UTC)
	(envelope-from scottl@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4JIE5e1006058;
	Tue, 19 May 2009 18:14:05 GMT (envelope-from scottl@svn.freebsd.org)
Received: (from scottl@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4JIE5LO006057;
	Tue, 19 May 2009 18:14:05 GMT (envelope-from scottl@svn.freebsd.org)
Message-Id: <200905191814.n4JIE5LO006057@svn.freebsd.org>
From: Scott Long <scottl@FreeBSD.org>
Date: Tue, 19 May 2009 18:14:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192402 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/ciss dev/cxgb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 May 2009 18:14:06 -0000

Author: scottl
Date: Tue May 19 18:14:04 2009
New Revision: 192402
URL: http://svn.freebsd.org/changeset/base/192402

Log:
  Merge PCI ID additions from vendor

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/ciss/ciss.c
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/ciss/ciss.c
==============================================================================
--- stable/7/sys/dev/ciss/ciss.c	Tue May 19 17:54:32 2009	(r192401)
+++ stable/7/sys/dev/ciss/ciss.c	Tue May 19 18:14:04 2009	(r192402)
@@ -292,17 +292,20 @@ static struct
     { 0x103C, 0x3234, CISS_BOARD_SA5,	"HP Smart Array P400" },
     { 0x103C, 0x3235, CISS_BOARD_SA5,	"HP Smart Array P400i" },
     { 0x103C, 0x3236, CISS_BOARD_SA5,	"HP Smart Array" },
-    { 0x103C, 0x3237, CISS_BOARD_SA5,	"HP Smart Array" },
+    { 0x103C, 0x3237, CISS_BOARD_SA5,	"HP Smart Array E500" },
     { 0x103C, 0x3238, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0x103C, 0x3239, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0x103C, 0x323A, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0x103C, 0x323B, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0x103C, 0x323C, CISS_BOARD_SA5,	"HP Smart Array" },
+    { 0x103C, 0x323D, CISS_BOARD_SA5,	"HP Smart Array P700m" },
     { 0x103C, 0x3241, CISS_BOARD_SA5,	"HP Smart Array P212" },
     { 0x103C, 0x3243, CISS_BOARD_SA5,	"HP Smart Array P410" },
     { 0x103C, 0x3245, CISS_BOARD_SA5,	"HP Smart Array P410i" },
     { 0x103C, 0x3247, CISS_BOARD_SA5,	"HP Smart Array P411" },
     { 0x103C, 0x3249, CISS_BOARD_SA5,	"HP Smart Array P812" },
+    { 0x103C, 0x324A, CISS_BOARD_SA5,	"HP Smart Array P712m" },
+    { 0x103C, 0x324B, CISS_BOARD_SA5,	"HP Smart Array" },
     { 0, 0, 0, NULL }
 };