From owner-p4-projects@FreeBSD.ORG  Mon Nov  6 01:02:02 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D65B116A415; Mon,  6 Nov 2006 01:02:01 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 884E816A40F
	for <perforce@freebsd.org>; Mon,  6 Nov 2006 01:02:01 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9830E43D4C
	for <perforce@freebsd.org>; Mon,  6 Nov 2006 01:02:00 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA6120Yq037784
	for <perforce@freebsd.org>; Mon, 6 Nov 2006 01:02:00 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA6120HZ037779
	for perforce@freebsd.org; Mon, 6 Nov 2006 01:02:00 GMT
	(envelope-from marcel@freebsd.org)
Date: Mon, 6 Nov 2006 01:02:00 GMT
Message-Id: <200611060102.kA6120HZ037779@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109322 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: Mon, 06 Nov 2006 01:02:02 -0000

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

Change 109322 by marcel@marcel_cluster on 2006/11/06 01:01:46

	Resolve merge "conflicts".

Affected files ...

.. //depot/projects/ia64/sys/boot/efi/libefi/errno.c#3 edit
.. //depot/projects/ia64/sys/boot/efi/libefi/handles.c#3 edit
.. //depot/projects/ia64/sys/boot/ia64/common/Makefile#3 edit
.. //depot/projects/ia64/sys/boot/ia64/common/autoload.c#3 edit
.. //depot/projects/ia64/sys/boot/ia64/common/libia64.h#3 edit
.. //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#7 edit
.. //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#3 edit

Differences ...

==== //depot/projects/ia64/sys/boot/efi/libefi/errno.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/errno.c,v 1.1 2006/11/05 22:03:03 marcel Exp $");
 
 #include <efi.h>
 #include <efilib.h>

==== //depot/projects/ia64/sys/boot/efi/libefi/handles.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/efi/libefi/handles.c,v 1.1 2006/11/05 22:03:03 marcel Exp $");
 
 #include <efi.h>
 #include <efilib.h>

==== //depot/projects/ia64/sys/boot/ia64/common/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.1 2006/11/05 22:03:03 marcel Exp $
 
 .include <bsd.own.mk>
 

==== //depot/projects/ia64/sys/boot/ia64/common/autoload.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/common/autoload.c,v 1.1 2006/11/05 22:03:03 marcel Exp $");
 
 int
 ia64_autoload(void)

==== //depot/projects/ia64/sys/boot/ia64/common/libia64.h#3 (text+ko) ====

@@ -23,7 +23,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$
+ * $FreeBSD: src/sys/boot/ia64/common/libia64.h,v 1.1 2006/11/05 22:03:03 marcel Exp $
  */
 
 #ifndef _LIBIA64_H_

==== //depot/projects/ia64/sys/boot/ia64/efi/efimd.c#7 (text+ko) ====

@@ -29,8 +29,6 @@
 
 #include <stand.h>
 
-#include <stand.h>
-
 #include <efi.h>
 #include <efilib.h>
 

==== //depot/projects/ia64/sys/boot/ia64/ski/skimd.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/skimd.c,v 1.1 2006/11/05 22:03:04 marcel Exp $");
 
 #include <stand.h>