PERFORCE change 207594 for review

[John Baldwin]

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

Change 207594 by jhb at 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.