PERFORCE change 60729 for review

[Peter Wemm]

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

Change 60729 by peter at peter_daintree on 2004/08/30 22:44:21

	fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/NOTES#45 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/NOTES#45 (text+ko) ====

@@ -5,7 +5,7 @@
 # machine independent notes, look in /sys/conf/NOTES.
 #
 # (XXX from i386:NOTES,v 1.1170)
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.18 2004/08/16 12:39:27 tjr Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.19 2004/08/27 21:29:20 arved Exp $
 #
 
 #