PERFORCE change 95775 for review

[Warner Losh]

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

Change 95775 by imp at 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_