From owner-p4-projects@FreeBSD.ORG  Fri Apr 21 06:56:15 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 5EFD216A407; Fri, 21 Apr 2006 06:56:15 +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 335AB16A402
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 06:56:15 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5569743D6A
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 06:56:12 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3L6uCrO036197
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 06:56:12 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3L6uCSC036191
	for perforce@freebsd.org; Fri, 21 Apr 2006 06:56:12 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 21 Apr 2006 06:56:12 GMT
Message-Id: <200604210656.k3L6uCSC036191@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95760 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: Fri, 21 Apr 2006 06:56:15 -0000

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

Change 95760 by imp@imp_harmony on 2006/04/21 06:55:20

	manually merge back from freebsd

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/linker.cfg#4 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/linker.cfg#4 (text+ko) ====

@@ -17,6 +17,8 @@
  * owners.  This software is not copyrighted and is intended for reference
  * only.
  * END_BLOCK
+ *
+ * $FreeBSD: src/sys/boot/arm/at91/linker.cfg,v 1.1 2006/04/19 17:16:48 imp Exp $
  ******************************************************************************/
 OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
 	      "elf32-littlearm")