From owner-p4-projects@FreeBSD.ORG  Wed Feb  5 20:57:16 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 03104F66; Wed,  5 Feb 2014 20:57:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B7DC2F64
 for <perforce@freebsd.org>; Wed,  5 Feb 2014 20:57:15 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9E1A51898
 for <perforce@freebsd.org>; Wed,  5 Feb 2014 20:57:15 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s15KvF7o069891
 for <perforce@freebsd.org>; Wed, 5 Feb 2014 20:57:15 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s15KvF6G069888
 for perforce@freebsd.org; Wed, 5 Feb 2014 20:57:15 GMT
 (envelope-from jhb@freebsd.org)
Date: Wed, 5 Feb 2014 20:57:15 GMT
Message-Id: <201402052057.s15KvF6G069888@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1190666 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 05 Feb 2014 20:57:16 -0000

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

Change 1190666 by jhb@jhb_ralph on 2014/02/05 20:56:36

	IFC @1190664

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci.c#57 integrate
.. //depot/projects/pci/sys/dev/pci/pci_pci.c#49 integrate

Differences ...

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

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/pci/pci.c 261524 2014-02-05 19:24:16Z jhb $");
+__FBSDID("$FreeBSD: head/sys/dev/pci/pci.c 261527 2014-02-05 20:52:12Z jhb $");
 
 #include "opt_bus.h"
 

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

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/pci/pci_pci.c 253450 2013-07-18 15:17:11Z jhb $");
+__FBSDID("$FreeBSD: head/sys/dev/pci/pci_pci.c 261527 2014-02-05 20:52:12Z jhb $");
 
 /*
  * PCI:PCI bridge support.