From owner-p4-projects@FreeBSD.ORG  Thu Jun 10 22:31:28 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C04F516A4D2; Thu, 10 Jun 2004 22:31:27 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 96BA916A4D1
	for <perforce@freebsd.org>; Thu, 10 Jun 2004 22:31:27 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 87C7E43D58
	for <perforce@freebsd.org>; Thu, 10 Jun 2004 22:31:27 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5AMUr8L016548
	for <perforce@freebsd.org>; Thu, 10 Jun 2004 22:30:53 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5AMUqBX016545
	for perforce@freebsd.org; Thu, 10 Jun 2004 22:30:52 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 10 Jun 2004 22:30:52 GMT
Message-Id: <200406102230.i5AMUqBX016545@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 54586 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 10 Jun 2004 22:31:28 -0000

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

Change 54586 by rwatson@rwatson_tislabs on 2004/06/10 22:30:08

	Top up integrate for netperf_socket as I prepare a new netperf
	patch.

Affected files ...

.. //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#5 integrate

Differences ...

==== //depot/projects/netperf_socket/sys/dev/ofw/ofw_console.c#5 (text+ko) ====

@@ -24,10 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.22 2004/06/04 16:02:51 phk Exp $");
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.22 2004/06/04 16:02:51 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.23 2004/06/10 22:15:51 marius Exp $");
 
 #include "opt_ddb.h"
 #include "opt_comconsole.h"