Log Message: ----------- resolve conflicts Modified Files: -------------- src/sys/sparc64/fhc: clkbrd.c (r1.2 -> r1.3) (http://cvsweb.midnightbsd.org/src/sys/sparc64/fhc/clkbrd.c?r1=1.2&r2=1.3) fhc.c (r1.2 -> r1.3) (http://cvsweb.midnightbsd.org/src/sys/sparc64/fhc/fhc.c?r1=1.2&r2=1.3)