From owner-p4-projects@FreeBSD.ORG Fri Apr 21 07:35:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ADF016A404; Fri, 21 Apr 2006 07:35:46 +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 43D6016A400 for ; Fri, 21 Apr 2006 07:35:46 +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 E904143D45 for ; Fri, 21 Apr 2006 07:35:45 +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 k3L7ZjiP058469 for ; Fri, 21 Apr 2006 07:35:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3L7ZjFm058461 for perforce@freebsd.org; Fri, 21 Apr 2006 07:35:45 GMT (envelope-from imp@freebsd.org) Date: Fri, 21 Apr 2006 07:35:45 GMT Message-Id: <200604210735.k3L7ZjFm058461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 95775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Apr 2006 07:35:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=95775 Change 95775 by imp@imp_harmony on 2006/04/21 07:35:37 More merging from FreeBSD to reduce diffs. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200.h#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.h#4 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200.h#3 (text) ==== @@ -7,7 +7,7 @@ // fitness for any particular purpose, or against the infringements of // intellectual property rights of others. // ---------------------------------------------------------------------------- -// $FreeBSD: src/sys/boot/arm/at91/inc/AT91RM9200.h,v 1.3 2006/04/15 02:51:53 imp Exp $ +// $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200.h,v 1.1 2006/04/19 17:16:49 imp Exp $ // // File Name : AT91RM9200.h // Object : AT91RM9200 definitions ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#6 (text) ==== @@ -24,7 +24,7 @@ * This software is derived from software provide by Kwikbyte who specifically * disclaimed copyright on the code. * - * $FreeBSD: src/sys/boot/arm/at91/boot0/at91rm9200_lowlevel.c,v 1.2 2006/04/13 17:39:34 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c,v 1.2 2006/04/21 07:29:14 imp Exp $ */ #include "at91rm9200.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.c#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/libat91/eeprom.c,v 1.1 2006/04/19 17:16:49 imp Exp $ *****************************************************************************/ #include "at91rm9200_lowlevel.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/eeprom.h#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/libat91/eeprom.h,v 1.1 2006/04/19 17:16:49 imp Exp $ ******************************************************************************/ #ifndef _EEPROM_H_