From owner-p4-projects@FreeBSD.ORG  Sat Feb 16 22:59:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E7E5216A418; Sat, 16 Feb 2008 22:59:08 +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 ADA5116A46B
	for <perforce@freebsd.org>; Sat, 16 Feb 2008 22:59:08 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7653F13C447
	for <perforce@freebsd.org>; Sat, 16 Feb 2008 22:59:08 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1GMx81V064695
	for <perforce@freebsd.org>; Sat, 16 Feb 2008 22:59:08 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1GMx8DB064692
	for perforce@freebsd.org; Sat, 16 Feb 2008 22:59:08 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 16 Feb 2008 22:59:08 GMT
Message-Id: <200802162259.m1GMx8DB064692@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 135532 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: Sat, 16 Feb 2008 22:59:09 -0000

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

Change 135532 by marcel@marcel_xcllnt on 2008/02/16 22:58:43

	Resolve merge...

Affected files ...

.. //depot/projects/e500/sys/boot/uboot/Makefile#3 edit

Differences ...

==== //depot/projects/e500/sys/boot/uboot/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
-# $FreeBSD: src/sys/boot/ofw/Makefile,v 1.1 2000/10/16 10:46:19 obrien Exp $
+# $FreeBSD: src/sys/boot/uboot/Makefile,v 1.1 2008/02/16 22:13:11 marcel Exp $
 
 SUBDIR=		lib
-
+ 
 .include <bsd.subdir.mk>