PERFORCE change 100819 for review

[Bruce M Simpson]

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

Change 100819 by bms at bms_montagne on 2006/07/06 23:17:58

	typo

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/cpufunc.h#7 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/include/cpufunc.h#7 (text+ko) ====

@@ -36,7 +36,6 @@
 static __inline void
 mips_barrier(void)
 {
-<<<<<<< yours
 	__asm __volatile (".set noreorder\n\t"
 			  "nop\n\t"
 			  "nop\n\t"