From owner-p4-projects  Sat Oct 26 17:43:54 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7ABBE37B404; Sat, 26 Oct 2002 17:43:50 -0700 (PDT)
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 0CCF937B401
	for <perforce@freebsd.org>; Sat, 26 Oct 2002 17:43:50 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A81B243E65
	for <perforce@freebsd.org>; Sat, 26 Oct 2002 17:43:49 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9R0grmV051651
	for <perforce@freebsd.org>; Sat, 26 Oct 2002 17:42:53 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9R0gqsX051648
	for perforce@freebsd.org; Sat, 26 Oct 2002 17:42:52 -0700 (PDT)
Date: Sat, 26 Oct 2002 17:42:52 -0700 (PDT)
Message-Id: <200210270042.g9R0gqsX051648@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 20215 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 20215 by peter@peter_daintree on 2002/10/26 17:42:06

	mismerge

Affected files ...

.. //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#5 integrate

Differences ...

==== //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#5 (text+ko) ====

@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/write_i386_disk.c,v 1.3 2002/10/23 21:05:42 phk Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/write_ia64_disk.c,v 1.4 2002/10/27 00:21:02 peter Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message