PERFORCE change 109322 for review

[Marcel Moolenaar]

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

Change 109322 by marcel at 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>