From owner-p4-projects@FreeBSD.ORG  Thu Jul 24 09:57:25 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B8C41065673; Thu, 24 Jul 2008 09:57:25 +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 F3F781065671
	for <perforce@FreeBSD.org>; Thu, 24 Jul 2008 09:57:24 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C2E658FC18
	for <perforce@FreeBSD.org>; Thu, 24 Jul 2008 09:57:24 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m6O9vOAG024221
	for <perforce@FreeBSD.org>; Thu, 24 Jul 2008 09:57:24 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6O9vO7g024219
	for perforce@freebsd.org; Thu, 24 Jul 2008 09:57:24 GMT
	(envelope-from ed@FreeBSD.org)
Date: Thu, 24 Jul 2008 09:57:24 GMT
Message-Id: <200807240957.m6O9vO7g024219@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 145779 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Thu, 24 Jul 2008 09:57:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=145779

Change 145779 by ed@ed_dull on 2008/07/24 09:56:50

	IFC.

Affected files ...

.. //depot/projects/mpsafetty/secure/lib/libcrypto/opensslconf-mips.h#1 branch
.. //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ugen.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/uhid.c#2 integrate

Differences ...

==== //depot/projects/mpsafetty/sys/dev/kbd/kbd.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.47 2007/12/29 21:55:23 wkoszek Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/kbd/kbd.c,v 1.48 2008/07/24 09:54:10 ed Exp $");
 
 #include "opt_kbd.h"
 
@@ -34,9 +34,9 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/clist.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
-#include <sys/clist.h>
 #include <sys/poll.h>
 #include <sys/priv.h>
 #include <sys/proc.h>

==== //depot/projects/mpsafetty/sys/dev/kbdmux/kbdmux.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $Id: kbdmux.c,v 1.4 2005/07/14 17:38:35 max Exp $
- * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.16 2007/12/29 21:55:23 wkoszek Exp $
+ * $FreeBSD: src/sys/dev/kbdmux/kbdmux.c,v 1.17 2008/07/24 09:54:10 ed Exp $
  */
 
 #include "opt_compat.h"
@@ -36,6 +36,7 @@
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/clist.h>
 #include <sys/conf.h>
 #include <sys/consio.h>
 #include <sys/fcntl.h>
@@ -52,7 +53,6 @@
 #include <sys/selinfo.h>
 #include <sys/systm.h>
 #include <sys/taskqueue.h>
-#include <sys/clist.h>
 #include <sys/uio.h>
 #include <dev/kbd/kbdreg.h>
 #include <dev/kbd/kbdtables.h>

==== //depot/projects/mpsafetty/sys/dev/usb/ugen.c#2 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.111 2007/06/28 06:22:40 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.112 2008/07/24 09:54:10 ed Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,6 +50,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/clist.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
@@ -58,7 +59,6 @@
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/filio.h>
-#include <sys/clist.h>
 #include <sys/file.h>
 #include <sys/selinfo.h>
 #include <sys/poll.h>

==== //depot/projects/mpsafetty/sys/dev/usb/uhid.c#2 (text+ko) ====

@@ -5,7 +5,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.96 2007/06/21 14:42:33 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.97 2008/07/24 09:54:10 ed Exp $");
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -55,6 +55,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/clist.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
@@ -67,7 +68,6 @@
 #include <sys/bus.h>
 #include <sys/ioccom.h>
 #include <sys/conf.h>
-#include <sys/clist.h>
 #include <sys/selinfo.h>
 #include <sys/proc.h>
 #include <sys/poll.h>