From owner-p4-projects@FreeBSD.ORG  Wed Mar  7 19:10:03 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38F301065674; Wed,  7 Mar 2012 19:10:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EFB7C106566B
	for <perforce@freebsd.org>; Wed,  7 Mar 2012 19:10:02 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id BF5B68FC12
	for <perforce@freebsd.org>; Wed,  7 Mar 2012 19:10:02 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q27JA2gn086015
	for <perforce@freebsd.org>; Wed, 7 Mar 2012 19:10:02 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q27JA2eZ086012
	for perforce@freebsd.org; Wed, 7 Mar 2012 19:10:02 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 7 Mar 2012 19:10:02 GMT
Message-Id: <201203071910.q27JA2eZ086012@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 207594 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Mar 2012 19:10:03 -0000

http://p4web.freebsd.org/@@207594?ac=10

Change 207594 by jhb@jhb_jhbbsd on 2012/03/07 19:09:58

	IFC @207593

Affected files ...

.. //depot/projects/pci/sys/dev/aac/aac_pci.c#5 integrate
.. //depot/projects/pci/sys/dev/pci/pci.c#36 integrate
.. //depot/projects/pci/sys/dev/pci/pci_private.h#11 integrate
.. //depot/projects/pci/sys/dev/twa/tw_osl.h#4 integrate
.. //depot/projects/pci/sys/dev/twa/tw_osl_freebsd.c#4 integrate

Differences ...

==== //depot/projects/pci/sys/dev/aac/aac_pci.c#5 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.77 2012/02/28 19:50:14 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.78 2012/03/07 18:52:46 jhb Exp $");
 
 /*
  * PCI bus interface and resource allocation.

==== //depot/projects/pci/sys/dev/pci/pci.c#36 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.433 2012/03/03 18:08:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.435 2012/03/07 18:57:09 jhb Exp $");
 
 #include "opt_bus.h"
 

==== //depot/projects/pci/sys/dev/pci/pci_private.h#11 (text+ko) ====

@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/pci/pci_private.h,v 1.33 2012/03/03 18:08:57 jhb Exp $
+ * $FreeBSD: src/sys/dev/pci/pci_private.h,v 1.34 2012/03/07 18:50:33 jhb Exp $
  *
  */
 

==== //depot/projects/pci/sys/dev/twa/tw_osl.h#4 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.10 2011/12/15 06:29:13 kevlo Exp $
+ *	$FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.11 2012/03/07 18:53:56 jhb Exp $
  */
 
 /*

==== //depot/projects/pci/sys/dev/twa/tw_osl_freebsd.c#4 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/twa/tw_osl_freebsd.c,v 1.20 2011/11/22 21:28:20 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/twa/tw_osl_freebsd.c,v 1.21 2012/03/07 18:53:56 jhb Exp $");
 
 /*
  * AMCC'S 3ware driver for 9000 series storage controllers.