summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 23:28:25 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-06-02 23:28:25 +0000
commitd34258b3dcc24f840b6539aa838cf9d31234ef7c (patch)
tree573d66af0b7db03790cf02f7965803d3248657d3 /sys/arch
parent08c639a666a74a7b5dbda90e8a6fa07f1da24c62 (diff)
Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/alpha/autoconf.c8
-rw-r--r--sys/arch/alpha/alpha/clock.c8
-rw-r--r--sys/arch/alpha/alpha/conf.c8
-rw-r--r--sys/arch/alpha/alpha/disksubr.c8
-rw-r--r--sys/arch/alpha/alpha/genassym.cf8
-rw-r--r--sys/arch/alpha/alpha/in_cksum.c8
-rw-r--r--sys/arch/alpha/alpha/mem.c8
-rw-r--r--sys/arch/alpha/alpha/pmap.c8
-rw-r--r--sys/arch/alpha/include/ansi.h8
-rw-r--r--sys/arch/alpha/include/cpu.h8
-rw-r--r--sys/arch/alpha/include/fbio.h8
-rw-r--r--sys/arch/alpha/include/float.h8
-rw-r--r--sys/arch/alpha/include/ieee.h8
-rw-r--r--sys/arch/alpha/include/kbio.h8
-rw-r--r--sys/arch/alpha/include/limits.h8
-rw-r--r--sys/arch/alpha/include/param.h8
-rw-r--r--sys/arch/alpha/include/pmap.h8
-rw-r--r--sys/arch/alpha/include/stdarg.h8
-rw-r--r--sys/arch/alpha/include/types.h8
-rw-r--r--sys/arch/alpha/include/varargs.h8
-rw-r--r--sys/arch/alpha/include/vmparam.h8
-rw-r--r--sys/arch/alpha/include/vuid_event.h8
-rw-r--r--sys/arch/alpha/isa/timerreg.h8
-rw-r--r--sys/arch/alpha/stand/boot/boot.c8
-rw-r--r--sys/arch/alpha/stand/boot/conf.c8
-rw-r--r--sys/arch/alpha/stand/boot/devopen.c8
-rw-r--r--sys/arch/alpha/stand/boot/disk.c8
-rw-r--r--sys/arch/alpha/stand/boot/newvers.sh8
-rw-r--r--sys/arch/alpha/stand/loadfile.c8
-rw-r--r--sys/arch/alpha/stand/netboot/devopen.c8
-rw-r--r--sys/arch/alpha/stand/netboot/netboot.c8
-rw-r--r--sys/arch/alpha/stand/netboot/newvers.sh8
-rw-r--r--sys/arch/alpha/tc/scc.c8
-rw-r--r--sys/arch/alpha/tc/sccreg.h8
-rw-r--r--sys/arch/alpha/tc/sccvar.h8
-rw-r--r--sys/arch/hp300/dev/ac.c8
-rw-r--r--sys/arch/hp300/dev/acioctl.h8
-rw-r--r--sys/arch/hp300/dev/acvar.h8
-rw-r--r--sys/arch/hp300/dev/ct.c8
-rw-r--r--sys/arch/hp300/dev/ctreg.h8
-rw-r--r--sys/arch/hp300/dev/dca.c8
-rw-r--r--sys/arch/hp300/dev/dcareg.h8
-rw-r--r--sys/arch/hp300/dev/dcm.c8
-rw-r--r--sys/arch/hp300/dev/dcmreg.h8
-rw-r--r--sys/arch/hp300/dev/dma.c8
-rw-r--r--sys/arch/hp300/dev/dmareg.h8
-rw-r--r--sys/arch/hp300/dev/dmavar.h8
-rw-r--r--sys/arch/hp300/dev/fhpib.c8
-rw-r--r--sys/arch/hp300/dev/fhpibreg.h8
-rw-r--r--sys/arch/hp300/dev/grf.c8
-rw-r--r--sys/arch/hp300/dev/grf_dv.c8
-rw-r--r--sys/arch/hp300/dev/grf_dvreg.h8
-rw-r--r--sys/arch/hp300/dev/grf_gb.c8
-rw-r--r--sys/arch/hp300/dev/grf_gbreg.h8
-rw-r--r--sys/arch/hp300/dev/grf_hy.c8
-rw-r--r--sys/arch/hp300/dev/grf_hyreg.h8
-rw-r--r--sys/arch/hp300/dev/grf_rb.c8
-rw-r--r--sys/arch/hp300/dev/grf_rbreg.h8
-rw-r--r--sys/arch/hp300/dev/grf_tc.c8
-rw-r--r--sys/arch/hp300/dev/grf_tcreg.h8
-rw-r--r--sys/arch/hp300/dev/grfioctl.h8
-rw-r--r--sys/arch/hp300/dev/grfreg.h8
-rw-r--r--sys/arch/hp300/dev/grfvar.h8
-rw-r--r--sys/arch/hp300/dev/hd.c8
-rw-r--r--sys/arch/hp300/dev/hdreg.h8
-rw-r--r--sys/arch/hp300/dev/hdvar.h8
-rw-r--r--sys/arch/hp300/dev/hil.c8
-rw-r--r--sys/arch/hp300/dev/hil_keymaps.c8
-rw-r--r--sys/arch/hp300/dev/hilioctl.h8
-rw-r--r--sys/arch/hp300/dev/hilreg.h8
-rw-r--r--sys/arch/hp300/dev/hilvar.h8
-rw-r--r--sys/arch/hp300/dev/hpib.c8
-rw-r--r--sys/arch/hp300/dev/hpibvar.h8
-rw-r--r--sys/arch/hp300/dev/if_le.c8
-rw-r--r--sys/arch/hp300/dev/if_lereg.h8
-rw-r--r--sys/arch/hp300/dev/if_levar.h8
-rw-r--r--sys/arch/hp300/dev/iotypes.h8
-rw-r--r--sys/arch/hp300/dev/ite.c8
-rw-r--r--sys/arch/hp300/dev/ite_subr.c8
-rw-r--r--sys/arch/hp300/dev/itereg.h8
-rw-r--r--sys/arch/hp300/dev/itevar.h8
-rw-r--r--sys/arch/hp300/dev/kbdmap.h8
-rw-r--r--sys/arch/hp300/dev/maskbits.h8
-rw-r--r--sys/arch/hp300/dev/nhpib.c8
-rw-r--r--sys/arch/hp300/dev/nhpibreg.h8
-rw-r--r--sys/arch/hp300/dev/ppi.c8
-rw-r--r--sys/arch/hp300/dev/ppiioctl.h8
-rw-r--r--sys/arch/hp300/dev/scsi.c8
-rw-r--r--sys/arch/hp300/dev/scsireg.h8
-rw-r--r--sys/arch/hp300/dev/scsivar.h8
-rw-r--r--sys/arch/hp300/dev/sd.c8
-rw-r--r--sys/arch/hp300/dev/sdvar.h8
-rw-r--r--sys/arch/hp300/dev/st.c8
-rw-r--r--sys/arch/hp300/dev/stvar.h8
-rw-r--r--sys/arch/hp300/hp300/autoconf.c8
-rw-r--r--sys/arch/hp300/hp300/clock.c8
-rw-r--r--sys/arch/hp300/hp300/clockreg.h8
-rw-r--r--sys/arch/hp300/hp300/conf.c8
-rw-r--r--sys/arch/hp300/hp300/disksubr.c8
-rw-r--r--sys/arch/hp300/hp300/dkbad.c8
-rw-r--r--sys/arch/hp300/hp300/genassym.cf8
-rw-r--r--sys/arch/hp300/hp300/kgdb_machdep.c8
-rw-r--r--sys/arch/hp300/hp300/leds.c8
-rw-r--r--sys/arch/hp300/hp300/leds.h8
-rw-r--r--sys/arch/hp300/hp300/locore.s8
-rw-r--r--sys/arch/hp300/hp300/machdep.c8
-rw-r--r--sys/arch/hp300/hp300/mem.c8
-rw-r--r--sys/arch/hp300/hp300/pmap_bootstrap.c8
-rw-r--r--sys/arch/hp300/hp300/sys_machdep.c8
-rw-r--r--sys/arch/hp300/hp300/trap.c8
-rw-r--r--sys/arch/hp300/hp300/vm_machdep.c8
-rw-r--r--sys/arch/hp300/include/cpu.h8
-rw-r--r--sys/arch/hp300/include/param.h8
-rw-r--r--sys/arch/hp300/include/pcb.h8
-rw-r--r--sys/arch/hp300/include/proc.h8
-rw-r--r--sys/arch/hp300/include/vmparam.h8
-rw-r--r--sys/arch/hp300/stand/cdboot/cdboot.c8
-rw-r--r--sys/arch/hp300/stand/cdboot/conf.c8
-rw-r--r--sys/arch/hp300/stand/cdboot/cons.c8
-rw-r--r--sys/arch/hp300/stand/common/apci.c8
-rw-r--r--sys/arch/hp300/stand/common/autoconf.c8
-rw-r--r--sys/arch/hp300/stand/common/cons.c8
-rw-r--r--sys/arch/hp300/stand/common/ct.c8
-rw-r--r--sys/arch/hp300/stand/common/dca.c8
-rw-r--r--sys/arch/hp300/stand/common/dcm.c8
-rw-r--r--sys/arch/hp300/stand/common/fhpib.c8
-rw-r--r--sys/arch/hp300/stand/common/hd.c8
-rw-r--r--sys/arch/hp300/stand/common/hil.c8
-rw-r--r--sys/arch/hp300/stand/common/hpib.c8
-rw-r--r--sys/arch/hp300/stand/common/ite.c8
-rw-r--r--sys/arch/hp300/stand/common/ite_dv.c8
-rw-r--r--sys/arch/hp300/stand/common/ite_gb.c8
-rw-r--r--sys/arch/hp300/stand/common/ite_hy.c8
-rw-r--r--sys/arch/hp300/stand/common/ite_rb.c8
-rw-r--r--sys/arch/hp300/stand/common/ite_subr.c8
-rw-r--r--sys/arch/hp300/stand/common/ite_tc.c8
-rw-r--r--sys/arch/hp300/stand/common/machdep.c8
-rw-r--r--sys/arch/hp300/stand/common/nhpib.c8
-rw-r--r--sys/arch/hp300/stand/common/prf.c8
-rw-r--r--sys/arch/hp300/stand/common/scsi.c8
-rw-r--r--sys/arch/hp300/stand/common/sd.c8
-rw-r--r--sys/arch/hp300/stand/include/consdefs.h8
-rw-r--r--sys/arch/hp300/stand/include/device.h8
-rw-r--r--sys/arch/hp300/stand/include/hpibvar.h8
-rw-r--r--sys/arch/hp300/stand/include/if_lereg.h8
-rw-r--r--sys/arch/hp300/stand/include/itevar.h8
-rw-r--r--sys/arch/hp300/stand/include/rominfo.h8
-rw-r--r--sys/arch/hp300/stand/include/samachdep.h8
-rw-r--r--sys/arch/hp300/stand/include/scsivar.h8
-rw-r--r--sys/arch/hp300/stand/include/volhdr.h8
-rw-r--r--sys/arch/hp300/stand/mkboot/mkboot.c10
-rw-r--r--sys/arch/hp300/stand/uboot/clock.c8
-rw-r--r--sys/arch/hp300/stand/uboot/conf.c8
-rw-r--r--sys/arch/hp300/stand/uboot/srt0.S8
-rw-r--r--sys/arch/hp300/stand/uboot/tgets.c8
-rw-r--r--sys/arch/hp300/stand/uboot/uboot.c8
-rw-r--r--sys/arch/hppa/gsc/gsckbd.c8
-rw-r--r--sys/arch/hppa/hppa/autoconf.c8
-rw-r--r--sys/arch/hppa/hppa/conf.c8
-rw-r--r--sys/arch/hppa/hppa/disksubr.c8
-rw-r--r--sys/arch/hppa/hppa/genassym.cf8
-rw-r--r--sys/arch/hppa/hppa/sys_machdep.c8
-rw-r--r--sys/arch/hppa/include/ansi.h8
-rw-r--r--sys/arch/hppa/include/float.h8
-rw-r--r--sys/arch/hppa/include/hil_machdep.h8
-rw-r--r--sys/arch/hppa/include/ieee.h8
-rw-r--r--sys/arch/hppa/include/limits.h8
-rw-r--r--sys/arch/hppa/include/proc.h8
-rw-r--r--sys/arch/hppa/include/profile.h8
-rw-r--r--sys/arch/hppa/include/stdarg.h8
-rw-r--r--sys/arch/hppa/include/types.h8
-rw-r--r--sys/arch/hppa/stand/mkboot/mkboot.88
-rw-r--r--sys/arch/hppa/stand/mkboot/mkboot.c10
-rw-r--r--sys/arch/i386/i386/autoconf.c8
-rw-r--r--sys/arch/i386/i386/disksubr.c8
-rw-r--r--sys/arch/i386/i386/dkbad.c8
-rw-r--r--sys/arch/i386/i386/freebsd_machdep.c8
-rw-r--r--sys/arch/i386/i386/genassym.cf8
-rw-r--r--sys/arch/i386/i386/ipx_cksum.c8
-rw-r--r--sys/arch/i386/i386/locore.s8
-rw-r--r--sys/arch/i386/i386/machdep.c8
-rw-r--r--sys/arch/i386/i386/mem.c8
-rw-r--r--sys/arch/i386/i386/ns_cksum.c8
-rw-r--r--sys/arch/i386/i386/process_machdep.c8
-rw-r--r--sys/arch/i386/i386/sys_machdep.c8
-rw-r--r--sys/arch/i386/i386/trap.c8
-rw-r--r--sys/arch/i386/i386/vm_machdep.c8
-rw-r--r--sys/arch/i386/include/ansi.h8
-rw-r--r--sys/arch/i386/include/asm.h8
-rw-r--r--sys/arch/i386/include/cpu.h8
-rw-r--r--sys/arch/i386/include/float.h8
-rw-r--r--sys/arch/i386/include/frame.h8
-rw-r--r--sys/arch/i386/include/freebsd_machdep.h8
-rw-r--r--sys/arch/i386/include/ieee.h8
-rw-r--r--sys/arch/i386/include/limits.h8
-rw-r--r--sys/arch/i386/include/npx.h8
-rw-r--r--sys/arch/i386/include/param.h8
-rw-r--r--sys/arch/i386/include/pcb.h8
-rw-r--r--sys/arch/i386/include/proc.h8
-rw-r--r--sys/arch/i386/include/profile.h8
-rw-r--r--sys/arch/i386/include/psl.h8
-rw-r--r--sys/arch/i386/include/reg.h8
-rw-r--r--sys/arch/i386/include/segments.h8
-rw-r--r--sys/arch/i386/include/signal.h8
-rw-r--r--sys/arch/i386/include/specialreg.h8
-rw-r--r--sys/arch/i386/include/stdarg.h8
-rw-r--r--sys/arch/i386/include/trap.h8
-rw-r--r--sys/arch/i386/include/tss.h8
-rw-r--r--sys/arch/i386/include/types.h8
-rw-r--r--sys/arch/i386/include/varargs.h8
-rw-r--r--sys/arch/i386/include/vmparam.h8
-rw-r--r--sys/arch/i386/isa/clock.c8
-rw-r--r--sys/arch/i386/isa/icu.h8
-rw-r--r--sys/arch/i386/isa/isa_machdep.c8
-rw-r--r--sys/arch/i386/isa/isa_machdep.h8
-rw-r--r--sys/arch/i386/isa/npx.c8
-rw-r--r--sys/arch/i386/isa/nvram.h8
-rw-r--r--sys/arch/i386/isa/pccom.c8
-rw-r--r--sys/arch/i386/isa/timerreg.h8
-rw-r--r--sys/arch/i386/stand/libsa/alloca.S8
-rw-r--r--sys/arch/m68k/fpe/fpu_add.c8
-rw-r--r--sys/arch/m68k/fpe/fpu_arith.h8
-rw-r--r--sys/arch/m68k/fpe/fpu_div.c8
-rw-r--r--sys/arch/m68k/fpe/fpu_explode.c8
-rw-r--r--sys/arch/m68k/fpe/fpu_implode.c8
-rw-r--r--sys/arch/m68k/fpe/fpu_mul.c8
-rw-r--r--sys/arch/m68k/fpe/fpu_sqrt.c8
-rw-r--r--sys/arch/m68k/fpe/fpu_subr.c8
-rw-r--r--sys/arch/m68k/fpe/ieee.h8
-rw-r--r--sys/arch/m68k/include/ansi.h8
-rw-r--r--sys/arch/m68k/include/cpu.h8
-rw-r--r--sys/arch/m68k/include/float.h8
-rw-r--r--sys/arch/m68k/include/frame.h8
-rw-r--r--sys/arch/m68k/include/ieee.h8
-rw-r--r--sys/arch/m68k/include/limits.h8
-rw-r--r--sys/arch/m68k/include/param.h8
-rw-r--r--sys/arch/m68k/include/pmap_motorola.h8
-rw-r--r--sys/arch/m68k/include/profile.h8
-rw-r--r--sys/arch/m68k/include/psl.h8
-rw-r--r--sys/arch/m68k/include/pte_motorola.h8
-rw-r--r--sys/arch/m68k/include/reg.h8
-rw-r--r--sys/arch/m68k/include/signal.h8
-rw-r--r--sys/arch/m68k/include/stdarg.h8
-rw-r--r--sys/arch/m68k/include/trap.h8
-rw-r--r--sys/arch/m68k/include/types.h8
-rw-r--r--sys/arch/m68k/include/varargs.h8
-rw-r--r--sys/arch/m68k/include/vmparam.h8
-rw-r--r--sys/arch/m68k/m68k/bcopy.s8
-rw-r--r--sys/arch/m68k/m68k/copy.s8
-rw-r--r--sys/arch/m68k/m68k/genassym.cf8
-rw-r--r--sys/arch/m68k/m68k/in_cksum.c8
-rw-r--r--sys/arch/m68k/m68k/kgdb_m68k.c8
-rw-r--r--sys/arch/m68k/m68k/mappedcopy.c8
-rw-r--r--sys/arch/m68k/m68k/ns_cksum.c8
-rw-r--r--sys/arch/m68k/m68k/pmap_bootstrap.c8
-rw-r--r--sys/arch/m68k/m68k/pmap_motorola.c8
-rw-r--r--sys/arch/m68k/m68k/proc_subr.s8
-rw-r--r--sys/arch/m68k/m68k/regdump.c8
-rw-r--r--sys/arch/m68k/m68k/sig_machdep.c8
-rw-r--r--sys/arch/m68k/m68k/sigcode.s8
-rw-r--r--sys/arch/m68k/m68k/sigreturn.s8
-rw-r--r--sys/arch/m68k/m68k/sunos_machdep.c8
-rw-r--r--sys/arch/m68k/m68k/support.s8
-rw-r--r--sys/arch/m68k/m68k/trap_subr.s8
-rw-r--r--sys/arch/mac68k/dev/grf.c8
-rw-r--r--sys/arch/mac68k/dev/grfvar.h8
-rw-r--r--sys/arch/mac68k/dev/ite.c8
-rw-r--r--sys/arch/mac68k/dev/z8530reg.h8
-rw-r--r--sys/arch/mac68k/dev/z8530sc.c8
-rw-r--r--sys/arch/mac68k/dev/z8530sc.h8
-rw-r--r--sys/arch/mac68k/dev/z8530tty.c8
-rw-r--r--sys/arch/mac68k/dev/z8530tty.h8
-rw-r--r--sys/arch/mac68k/dev/zsvar.h8
-rw-r--r--sys/arch/mac68k/include/cpu.h8
-rw-r--r--sys/arch/mac68k/include/grfioctl.h8
-rw-r--r--sys/arch/mac68k/include/param.h8
-rw-r--r--sys/arch/mac68k/include/pcb.h8
-rw-r--r--sys/arch/mac68k/include/proc.h8
-rw-r--r--sys/arch/mac68k/include/vmparam.h8
-rw-r--r--sys/arch/mac68k/include/z8530var.h8
-rw-r--r--sys/arch/mac68k/mac68k/autoconf.c8
-rw-r--r--sys/arch/mac68k/mac68k/clock.c8
-rw-r--r--sys/arch/mac68k/mac68k/conf.c8
-rw-r--r--sys/arch/mac68k/mac68k/disksubr.c8
-rw-r--r--sys/arch/mac68k/mac68k/genassym.cf8
-rw-r--r--sys/arch/mac68k/mac68k/locore.s8
-rw-r--r--sys/arch/mac68k/mac68k/machdep.c8
-rw-r--r--sys/arch/mac68k/mac68k/mem.c8
-rw-r--r--sys/arch/mac68k/mac68k/pmap_bootstrap.c8
-rw-r--r--sys/arch/mac68k/mac68k/sys_machdep.c8
-rw-r--r--sys/arch/mac68k/mac68k/trap.c8
-rw-r--r--sys/arch/mac68k/mac68k/vm_machdep.c8
-rw-r--r--sys/arch/macppc/dev/macintr.c8
-rw-r--r--sys/arch/macppc/dev/openpic.c8
-rw-r--r--sys/arch/macppc/dev/z8530reg.h8
-rw-r--r--sys/arch/macppc/dev/z8530sc.c8
-rw-r--r--sys/arch/macppc/dev/z8530sc.h8
-rw-r--r--sys/arch/macppc/dev/z8530tty.c8
-rw-r--r--sys/arch/macppc/include/z8530var.h6
-rw-r--r--sys/arch/macppc/macppc/autoconf.c10
-rw-r--r--sys/arch/macppc/macppc/disksubr.c8
-rw-r--r--sys/arch/macppc/macppc/genassym.cf8
-rw-r--r--sys/arch/macppc/macppc/mem.c8
-rw-r--r--sys/arch/mvme68k/dev/clock.c8
-rw-r--r--sys/arch/mvme68k/dev/dmavar.h8
-rw-r--r--sys/arch/mvme68k/dev/if_le.c8
-rw-r--r--sys/arch/mvme68k/dev/if_lereg.h8
-rw-r--r--sys/arch/mvme68k/dev/if_levar.h8
-rw-r--r--sys/arch/mvme68k/dev/nvramreg.h8
-rw-r--r--sys/arch/mvme68k/dev/sbic.c8
-rw-r--r--sys/arch/mvme68k/dev/sbicreg.h8
-rw-r--r--sys/arch/mvme68k/dev/sbicvar.h8
-rw-r--r--sys/arch/mvme68k/dev/ssh.c8
-rw-r--r--sys/arch/mvme68k/dev/sshdma.c8
-rw-r--r--sys/arch/mvme68k/dev/sshreg.h8
-rw-r--r--sys/arch/mvme68k/dev/sshvar.h8
-rw-r--r--sys/arch/mvme68k/dev/vs.c8
-rw-r--r--sys/arch/mvme68k/dev/vsreg.h8
-rw-r--r--sys/arch/mvme68k/dev/vsvar.h8
-rw-r--r--sys/arch/mvme68k/dev/wdsc.c8
-rw-r--r--sys/arch/mvme68k/dev/wdscreg.h8
-rw-r--r--sys/arch/mvme68k/include/cpu.h8
-rw-r--r--sys/arch/mvme68k/include/param.h8
-rw-r--r--sys/arch/mvme68k/include/pcb.h8
-rw-r--r--sys/arch/mvme68k/include/proc.h8
-rw-r--r--sys/arch/mvme68k/include/vmparam.h8
-rw-r--r--sys/arch/mvme68k/mvme68k/autoconf.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/conf.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/dkbad.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/genassym.cf8
-rw-r--r--sys/arch/mvme68k/mvme68k/locore.s8
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/mem.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/pmap_bootstrap.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/sys_machdep.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/trap.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/vm_machdep.c8
-rw-r--r--sys/arch/mvme68k/stand/bootsd/boot.c8
-rw-r--r--sys/arch/mvme68k/stand/bootst/boot.c8
-rw-r--r--sys/arch/mvme68k/stand/libsa/exec_mvme.c8
-rw-r--r--sys/arch/mvme68k/stand/netboot/boot.c8
-rw-r--r--sys/arch/mvme68k/stand/netboot/if_lereg.h8
-rw-r--r--sys/arch/mvme68k/stand/sboot/clock.c8
-rw-r--r--sys/arch/mvme68k/stand/sboot/clockreg.h8
-rw-r--r--sys/arch/mvme68k/stand/sboot/if_lereg.h8
-rw-r--r--sys/arch/mvme88k/dev/clock.c8
-rw-r--r--sys/arch/mvme88k/dev/if_ve.c8
-rw-r--r--sys/arch/mvme88k/dev/if_vereg.h8
-rw-r--r--sys/arch/mvme88k/dev/nvramreg.h8
-rw-r--r--sys/arch/mvme88k/dev/sclock.c8
-rw-r--r--sys/arch/mvme88k/dev/ssh.c8
-rw-r--r--sys/arch/mvme88k/dev/sshdma.c8
-rw-r--r--sys/arch/mvme88k/dev/sshreg.h8
-rw-r--r--sys/arch/mvme88k/dev/sshvar.h8
-rw-r--r--sys/arch/mvme88k/dev/vs.c8
-rw-r--r--sys/arch/mvme88k/dev/vsreg.h8
-rw-r--r--sys/arch/mvme88k/dev/vsvar.h8
-rw-r--r--sys/arch/mvme88k/include/ansi.h8
-rw-r--r--sys/arch/mvme88k/include/cpu.h8
-rw-r--r--sys/arch/mvme88k/include/float.h8
-rw-r--r--sys/arch/mvme88k/include/frame.h8
-rw-r--r--sys/arch/mvme88k/include/ieee.h8
-rw-r--r--sys/arch/mvme88k/include/limits.h10
-rw-r--r--sys/arch/mvme88k/include/mmu.h8
-rw-r--r--sys/arch/mvme88k/include/param.h8
-rw-r--r--sys/arch/mvme88k/include/proc.h10
-rw-r--r--sys/arch/mvme88k/include/profile.h10
-rw-r--r--sys/arch/mvme88k/include/ptrace.h10
-rw-r--r--sys/arch/mvme88k/include/types.h8
-rw-r--r--sys/arch/mvme88k/mvme88k/conf.c8
-rw-r--r--sys/arch/mvme88k/mvme88k/dkbad.c8
-rw-r--r--sys/arch/mvme88k/mvme88k/genassym.cf10
-rw-r--r--sys/arch/mvme88k/mvme88k/mem.c8
-rw-r--r--sys/arch/mvme88k/mvme88k/process_machdep.c8
-rw-r--r--sys/arch/mvme88k/mvme88k/vm_machdep.c8
-rw-r--r--sys/arch/mvme88k/stand/bootsd/boot.c8
-rw-r--r--sys/arch/mvme88k/stand/bootst/boot.c8
-rw-r--r--sys/arch/mvme88k/stand/libsa/exec_mvme.c8
-rw-r--r--sys/arch/mvme88k/stand/netboot/boot.c8
-rw-r--r--sys/arch/mvme88k/stand/netboot/if_lereg.h8
-rw-r--r--sys/arch/mvme88k/stand/sboot/clock.c8
-rw-r--r--sys/arch/mvme88k/stand/sboot/clockreg.h8
-rw-r--r--sys/arch/mvme88k/stand/sboot/if_lereg.h8
-rw-r--r--sys/arch/mvmeppc/dev/mem.c8
-rw-r--r--sys/arch/mvmeppc/dev/nvramreg.h8
-rw-r--r--sys/arch/mvmeppc/dev/openpic.c8
-rw-r--r--sys/arch/mvmeppc/isa/isa_machdep.c8
-rw-r--r--sys/arch/mvmeppc/isa/isa_machdep.h8
-rw-r--r--sys/arch/mvmeppc/mvmeppc/autoconf.c10
-rw-r--r--sys/arch/mvmeppc/mvmeppc/disksubr.c8
-rw-r--r--sys/arch/mvmeppc/mvmeppc/genassym.cf8
-rw-r--r--sys/arch/mvmeppc/stand/bootsd/boot.c8
-rw-r--r--sys/arch/mvmeppc/stand/bootst/boot.c8
-rw-r--r--sys/arch/mvmeppc/stand/libsa/exec_mvme.c8
-rw-r--r--sys/arch/mvmeppc/stand/tftpboot/boot.c8
-rw-r--r--sys/arch/powerpc/include/ansi.h8
-rw-r--r--sys/arch/powerpc/include/float.h8
-rw-r--r--sys/arch/powerpc/include/ieee.h8
-rw-r--r--sys/arch/powerpc/include/reg.h8
-rw-r--r--sys/arch/powerpc/include/stdarg.h8
-rw-r--r--sys/arch/powerpc/include/varargs.h8
-rw-r--r--sys/arch/powerpc/include/vuid_event.h8
-rw-r--r--sys/arch/powerpc/powerpc/bcopy.c10
-rw-r--r--sys/arch/sparc/dev/amd7930var.h8
-rw-r--r--sys/arch/sparc/dev/bt_subr.c8
-rw-r--r--sys/arch/sparc/dev/btreg.h8
-rw-r--r--sys/arch/sparc/dev/btvar.h8
-rw-r--r--sys/arch/sparc/dev/bwtwo.c8
-rw-r--r--sys/arch/sparc/dev/bwtworeg.h8
-rw-r--r--sys/arch/sparc/dev/cgeight.c8
-rw-r--r--sys/arch/sparc/dev/cgfour.c8
-rw-r--r--sys/arch/sparc/dev/cgsix.c8
-rw-r--r--sys/arch/sparc/dev/cgsixreg.h8
-rw-r--r--sys/arch/sparc/dev/cgthree.c8
-rw-r--r--sys/arch/sparc/dev/cgthreereg.h8
-rw-r--r--sys/arch/sparc/dev/cgtwo.c8
-rw-r--r--sys/arch/sparc/dev/fb.c8
-rw-r--r--sys/arch/sparc/dev/fd.c8
-rw-r--r--sys/arch/sparc/dev/fdreg.h8
-rw-r--r--sys/arch/sparc/dev/if_lereg.h8
-rw-r--r--sys/arch/sparc/dev/if_levar.h8
-rw-r--r--sys/arch/sparc/dev/sbus.c8
-rw-r--r--sys/arch/sparc/dev/sbusreg.h8
-rw-r--r--sys/arch/sparc/dev/sbusvar.h8
-rw-r--r--sys/arch/sparc/dev/z8530kbd.c8
-rw-r--r--sys/arch/sparc/dev/z8530reg.h8
-rw-r--r--sys/arch/sparc/dev/z8530sc.c8
-rw-r--r--sys/arch/sparc/dev/z8530sc.h8
-rw-r--r--sys/arch/sparc/dev/z8530tty.c8
-rw-r--r--sys/arch/sparc/fpu/fpu.c8
-rw-r--r--sys/arch/sparc/fpu/fpu_add.c8
-rw-r--r--sys/arch/sparc/fpu/fpu_arith.h8
-rw-r--r--sys/arch/sparc/fpu/fpu_compare.c8
-rw-r--r--sys/arch/sparc/fpu/fpu_div.c8
-rw-r--r--sys/arch/sparc/fpu/fpu_emu.h8
-rw-r--r--sys/arch/sparc/fpu/fpu_explode.c8
-rw-r--r--sys/arch/sparc/fpu/fpu_implode.c8
-rw-r--r--sys/arch/sparc/fpu/fpu_mul.c8
-rw-r--r--sys/arch/sparc/fpu/fpu_sqrt.c8
-rw-r--r--sys/arch/sparc/fpu/fpu_subr.c8
-rw-r--r--sys/arch/sparc/include/ansi.h8
-rw-r--r--sys/arch/sparc/include/autoconf.h8
-rw-r--r--sys/arch/sparc/include/bsd_openprom.h8
-rw-r--r--sys/arch/sparc/include/cpu.h8
-rw-r--r--sys/arch/sparc/include/ctlreg.h8
-rw-r--r--sys/arch/sparc/include/fbvar.h8
-rw-r--r--sys/arch/sparc/include/float.h8
-rw-r--r--sys/arch/sparc/include/frame.h8
-rw-r--r--sys/arch/sparc/include/fsr.h8
-rw-r--r--sys/arch/sparc/include/ieee.h8
-rw-r--r--sys/arch/sparc/include/instr.h8
-rw-r--r--sys/arch/sparc/include/limits.h8
-rw-r--r--sys/arch/sparc/include/openpromio.h8
-rw-r--r--sys/arch/sparc/include/param.h8
-rw-r--r--sys/arch/sparc/include/pcb.h8
-rw-r--r--sys/arch/sparc/include/proc.h8
-rw-r--r--sys/arch/sparc/include/profile.h8
-rw-r--r--sys/arch/sparc/include/psl.h8
-rw-r--r--sys/arch/sparc/include/ptrace.h8
-rw-r--r--sys/arch/sparc/include/reg.h8
-rw-r--r--sys/arch/sparc/include/reloc.h8
-rw-r--r--sys/arch/sparc/include/remote-sl.h8
-rw-r--r--sys/arch/sparc/include/signal.h8
-rw-r--r--sys/arch/sparc/include/stdarg.h8
-rw-r--r--sys/arch/sparc/include/sun_disklabel.h8
-rw-r--r--sys/arch/sparc/include/trap.h8
-rw-r--r--sys/arch/sparc/include/types.h8
-rw-r--r--sys/arch/sparc/include/varargs.h8
-rw-r--r--sys/arch/sparc/include/vmparam.h8
-rw-r--r--sys/arch/sparc/include/z8530var.h8
-rw-r--r--sys/arch/sparc/sparc/amd7930intr.s8
-rw-r--r--sys/arch/sparc/sparc/asm.h8
-rw-r--r--sys/arch/sparc/sparc/autoconf.c8
-rw-r--r--sys/arch/sparc/sparc/auxioreg.h8
-rw-r--r--sys/arch/sparc/sparc/auxreg.c8
-rw-r--r--sys/arch/sparc/sparc/clockreg.h8
-rw-r--r--sys/arch/sparc/sparc/conf.c8
-rw-r--r--sys/arch/sparc/sparc/genassym.cf8
-rw-r--r--sys/arch/sparc/sparc/in_cksum.c8
-rw-r--r--sys/arch/sparc/sparc/intr.c8
-rw-r--r--sys/arch/sparc/sparc/intreg.h8
-rw-r--r--sys/arch/sparc/sparc/kgdb_machdep.c8
-rw-r--r--sys/arch/sparc/sparc/kgdb_proto.h8
-rw-r--r--sys/arch/sparc/sparc/locore2.c8
-rw-r--r--sys/arch/sparc/sparc/machdep.c8
-rw-r--r--sys/arch/sparc/sparc/mem.c8
-rw-r--r--sys/arch/sparc/sparc/memreg.h8
-rw-r--r--sys/arch/sparc/sparc/openprom.c8
-rw-r--r--sys/arch/sparc/sparc/process_machdep.c8
-rw-r--r--sys/arch/sparc/sparc/sys_machdep.c8
-rw-r--r--sys/arch/sparc/sparc/timerreg.h8
-rw-r--r--sys/arch/sparc/stand/boot/boot.c8
-rw-r--r--sys/arch/sparc/stand/boot/loadfile.c8
-rw-r--r--sys/arch/sparc64/dev/iommureg.h8
-rw-r--r--sys/arch/sparc64/dev/sbus.c8
-rw-r--r--sys/arch/sparc64/dev/sbusvar.h8
-rw-r--r--sys/arch/sparc64/dev/upavar.h8
-rw-r--r--sys/arch/sparc64/dev/z8530kbd.c8
-rw-r--r--sys/arch/sparc64/dev/z8530reg.h8
-rw-r--r--sys/arch/sparc64/dev/z8530sc.c8
-rw-r--r--sys/arch/sparc64/dev/z8530sc.h8
-rw-r--r--sys/arch/sparc64/dev/z8530tty.c8
-rw-r--r--sys/arch/sparc64/fpu/fpu.c8
-rw-r--r--sys/arch/sparc64/fpu/fpu_add.c8
-rw-r--r--sys/arch/sparc64/fpu/fpu_arith.h8
-rw-r--r--sys/arch/sparc64/fpu/fpu_compare.c8
-rw-r--r--sys/arch/sparc64/fpu/fpu_div.c8
-rw-r--r--sys/arch/sparc64/fpu/fpu_emu.h8
-rw-r--r--sys/arch/sparc64/fpu/fpu_explode.c8
-rw-r--r--sys/arch/sparc64/fpu/fpu_implode.c8
-rw-r--r--sys/arch/sparc64/fpu/fpu_mul.c8
-rw-r--r--sys/arch/sparc64/fpu/fpu_sqrt.c8
-rw-r--r--sys/arch/sparc64/fpu/fpu_subr.c8
-rw-r--r--sys/arch/sparc64/include/ansi.h8
-rw-r--r--sys/arch/sparc64/include/autoconf.h8
-rw-r--r--sys/arch/sparc64/include/bsd_openprom.h8
-rw-r--r--sys/arch/sparc64/include/cpu.h8
-rw-r--r--sys/arch/sparc64/include/float.h8
-rw-r--r--sys/arch/sparc64/include/frame.h8
-rw-r--r--sys/arch/sparc64/include/fsr.h8
-rw-r--r--sys/arch/sparc64/include/ieee.h8
-rw-r--r--sys/arch/sparc64/include/instr.h8
-rw-r--r--sys/arch/sparc64/include/int_types.h8
-rw-r--r--sys/arch/sparc64/include/limits.h8
-rw-r--r--sys/arch/sparc64/include/openpromio.h8
-rw-r--r--sys/arch/sparc64/include/param.h8
-rw-r--r--sys/arch/sparc64/include/pcb.h8
-rw-r--r--sys/arch/sparc64/include/proc.h6
-rw-r--r--sys/arch/sparc64/include/profile.h8
-rw-r--r--sys/arch/sparc64/include/psl.h8
-rw-r--r--sys/arch/sparc64/include/ptrace.h8
-rw-r--r--sys/arch/sparc64/include/reg.h8
-rw-r--r--sys/arch/sparc64/include/signal.h8
-rw-r--r--sys/arch/sparc64/include/stdarg.h8
-rw-r--r--sys/arch/sparc64/include/types.h8
-rw-r--r--sys/arch/sparc64/include/varargs.h8
-rw-r--r--sys/arch/sparc64/include/vmparam.h8
-rw-r--r--sys/arch/sparc64/include/vuid_event.h8
-rw-r--r--sys/arch/sparc64/include/z8530var.h8
-rw-r--r--sys/arch/sparc64/sparc64/autoconf.c8
-rw-r--r--sys/arch/sparc64/sparc64/conf.c8
-rw-r--r--sys/arch/sparc64/sparc64/genassym.cf6
-rw-r--r--sys/arch/sparc64/sparc64/intreg.h8
-rw-r--r--sys/arch/sparc64/sparc64/locore2.c8
-rw-r--r--sys/arch/sparc64/sparc64/machdep.c8
-rw-r--r--sys/arch/sparc64/sparc64/mem.c8
-rw-r--r--sys/arch/sparc64/sparc64/netbsd_machdep.c8
-rw-r--r--sys/arch/sparc64/sparc64/openprom.c8
-rw-r--r--sys/arch/sparc64/sparc64/process_machdep.c8
-rw-r--r--sys/arch/sparc64/sparc64/sys_machdep.c8
-rw-r--r--sys/arch/sparc64/sparc64/timerreg.h8
-rw-r--r--sys/arch/sparc64/stand/bootblk/genfth.cf8
-rw-r--r--sys/arch/vax/bi/bireg.h8
-rw-r--r--sys/arch/vax/bi/if_nireg.h8
-rw-r--r--sys/arch/vax/bi/kdbreg.h8
-rw-r--r--sys/arch/vax/boot/boot/boot.c8
-rw-r--r--sys/arch/vax/boot/xxboot/bootxx.c8
-rw-r--r--sys/arch/vax/dec/dzkbd.c8
-rw-r--r--sys/arch/vax/dec/dzms.c8
-rw-r--r--sys/arch/vax/if/if_de.c8
-rw-r--r--sys/arch/vax/if/if_dereg.h8
-rw-r--r--sys/arch/vax/if/if_le.c8
-rw-r--r--sys/arch/vax/if/if_qereg.h8
-rw-r--r--sys/arch/vax/if/if_uba.c8
-rw-r--r--sys/arch/vax/if/if_uba.h8
-rw-r--r--sys/arch/vax/if/if_zereg.h8
-rw-r--r--sys/arch/vax/if/sgecreg.h8
-rw-r--r--sys/arch/vax/include/ansi.h8
-rw-r--r--sys/arch/vax/include/asm.h8
-rw-r--r--sys/arch/vax/include/float.h8
-rw-r--r--sys/arch/vax/include/ioa.h8
-rw-r--r--sys/arch/vax/include/ka630.h8
-rw-r--r--sys/arch/vax/include/ka650.h8
-rw-r--r--sys/arch/vax/include/ka820.h8
-rw-r--r--sys/arch/vax/include/limits.h8
-rw-r--r--sys/arch/vax/include/nexus.h8
-rw-r--r--sys/arch/vax/include/param.h8
-rw-r--r--sys/arch/vax/include/pmap.h8
-rw-r--r--sys/arch/vax/include/proc.h8
-rw-r--r--sys/arch/vax/include/profile.h8
-rw-r--r--sys/arch/vax/include/psl.h8
-rw-r--r--sys/arch/vax/include/signal.h8
-rw-r--r--sys/arch/vax/include/stdarg.h8
-rw-r--r--sys/arch/vax/include/trap.h8
-rw-r--r--sys/arch/vax/include/types.h8
-rw-r--r--sys/arch/vax/include/varargs.h8
-rw-r--r--sys/arch/vax/include/vmparam.h8
-rw-r--r--sys/arch/vax/mscp/mscp.c8
-rw-r--r--sys/arch/vax/mscp/mscp.h8
-rw-r--r--sys/arch/vax/mscp/mscp_disk.c8
-rw-r--r--sys/arch/vax/mscp/mscp_subr.c8
-rw-r--r--sys/arch/vax/mscp/mscpreg.h8
-rw-r--r--sys/arch/vax/mscp/mscpvar.h8
-rw-r--r--sys/arch/vax/qbus/dhu.c8
-rw-r--r--sys/arch/vax/qbus/dl.c8
-rw-r--r--sys/arch/vax/qbus/dz.c8
-rw-r--r--sys/arch/vax/qbus/dzvar.h8
-rw-r--r--sys/arch/vax/qbus/if_de.c8
-rw-r--r--sys/arch/vax/qbus/if_dereg.h8
-rw-r--r--sys/arch/vax/qbus/qd.c8
-rw-r--r--sys/arch/vax/qbus/qdioctl.h8
-rw-r--r--sys/arch/vax/qbus/qdreg.h8
-rw-r--r--sys/arch/vax/qbus/qduser.h8
-rw-r--r--sys/arch/vax/qbus/qevent.h8
-rw-r--r--sys/arch/vax/qbus/qfont.c8
-rw-r--r--sys/arch/vax/qbus/uba.c8
-rw-r--r--sys/arch/vax/qbus/ubavar.h8
-rw-r--r--sys/arch/vax/qbus/uda.c8
-rw-r--r--sys/arch/vax/stand/boot/boot.c8
-rw-r--r--sys/arch/vax/stand/xxboot/bootxx.c8
-rw-r--r--sys/arch/vax/uba/qv.c8
-rw-r--r--sys/arch/vax/uba/ts.c8
-rw-r--r--sys/arch/vax/uba/uba.c8
-rw-r--r--sys/arch/vax/uba/uba_cmi.c8
-rw-r--r--sys/arch/vax/uba/uba_common.h8
-rw-r--r--sys/arch/vax/uba/uba_ibus.c8
-rw-r--r--sys/arch/vax/uba/uba_mainbus.c8
-rw-r--r--sys/arch/vax/uba/uba_sbi.c8
-rw-r--r--sys/arch/vax/uba/ubareg.h8
-rw-r--r--sys/arch/vax/uba/ubavar.h8
-rw-r--r--sys/arch/vax/uba/uda.c8
-rw-r--r--sys/arch/vax/vax/cfl.c8
-rw-r--r--sys/arch/vax/vax/conf.c8
-rw-r--r--sys/arch/vax/vax/crl.c8
-rw-r--r--sys/arch/vax/vax/crx.c8
-rw-r--r--sys/arch/vax/vax/crx.h8
-rw-r--r--sys/arch/vax/vax/disksubr.c8
-rw-r--r--sys/arch/vax/vax/emulate.s8
-rw-r--r--sys/arch/vax/vax/in_cksum.c8
-rw-r--r--sys/arch/vax/vax/ka630.c8
-rw-r--r--sys/arch/vax/vax/ka650.c8
-rw-r--r--sys/arch/vax/vax/ka750.c8
-rw-r--r--sys/arch/vax/vax/ka780.c8
-rw-r--r--sys/arch/vax/vax/ka820.c8
-rw-r--r--sys/arch/vax/vax/ka860.c8
-rw-r--r--sys/arch/vax/vax/machdep.c8
-rw-r--r--sys/arch/vax/vax/mem.c8
-rw-r--r--sys/arch/vax/vax/ns_cksum.c8
-rw-r--r--sys/arch/vax/vax/rootfil.c8
-rw-r--r--sys/arch/vax/vax/udiv.s8
-rw-r--r--sys/arch/vax/vax/urem.s8
-rw-r--r--sys/arch/vax/vax/uvaxII.c8
-rw-r--r--sys/arch/vax/vax/uvax_proto.c8
-rw-r--r--sys/arch/vax/vsa/dc.c8
-rw-r--r--sys/arch/vax/vsa/dc7085cons.h8
-rw-r--r--sys/arch/vax/vsa/if_le_vsbus.c8
646 files changed, 1299 insertions, 3883 deletions
diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index 59699e37717..51c00114733 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.21 2003/05/11 19:41:08 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.22 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: autoconf.c,v 1.16 1996/11/13 21:13:04 cgd Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/alpha/clock.c b/sys/arch/alpha/alpha/clock.c
index 508113a23bd..8ac5dd9b79b 100644
--- a/sys/arch/alpha/alpha/clock.c
+++ b/sys/arch/alpha/alpha/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.11 2000/11/26 19:41:21 millert Exp $ */
+/* $OpenBSD: clock.c,v 1.12 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: clock.c,v 1.29 2000/06/05 21:47:10 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 7e6059f31ba..bb9404639f1 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.46 2003/05/14 00:20:37 tedu Exp $ */
+/* $OpenBSD: conf.c,v 1.47 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 815fe04a85f..f5209c9a092 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.36 2002/12/10 23:31:07 miod Exp $ */
+/* $OpenBSD: disksubr.c,v 1.37 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/alpha/genassym.cf b/sys/arch/alpha/alpha/genassym.cf
index 6cf7c979d86..27d0faa330b 100644
--- a/sys/arch/alpha/alpha/genassym.cf
+++ b/sys/arch/alpha/alpha/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.4 2002/01/16 20:50:14 miod Exp $
+# $OpenBSD: genassym.cf,v 1.5 2003/06/02 23:27:43 millert Exp $
# Copyright (c) 1994, 1995 Gordon W. Ross
# Copyright (c) 1993 Adam Glass
@@ -13,11 +13,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/alpha/alpha/in_cksum.c b/sys/arch/alpha/alpha/in_cksum.c
index c87f08f39af..8e33ffa2fc7 100644
--- a/sys/arch/alpha/alpha/in_cksum.c
+++ b/sys/arch/alpha/alpha/in_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_cksum.c,v 1.5 2002/03/14 01:26:26 millert Exp $ */
+/* $OpenBSD: in_cksum.c,v 1.6 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: in_cksum.c,v 1.4 1996/11/13 21:13:06 cgd Exp $ */
/*
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/alpha/mem.c b/sys/arch/alpha/alpha/mem.c
index 1213e72260e..09f4ff09984 100644
--- a/sys/arch/alpha/alpha/mem.c
+++ b/sys/arch/alpha/alpha/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.17 2002/08/24 17:21:45 matthieu Exp $ */
+/* $OpenBSD: mem.c,v 1.18 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: mem.c,v 1.26 2000/03/29 03:48:20 simonb Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c
index 59bfc8756fa..120eb193ddb 100644
--- a/sys/arch/alpha/alpha/pmap.c
+++ b/sys/arch/alpha/alpha/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.37 2003/02/18 13:14:43 jmc Exp $ */
+/* $OpenBSD: pmap.c,v 1.38 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */
/*-
@@ -54,11 +54,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/ansi.h b/sys/arch/alpha/include/ansi.h
index f7a73d224b8..13755b90ffb 100644
--- a/sys/arch/alpha/include/ansi.h
+++ b/sys/arch/alpha/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.9 2000/02/22 17:29:12 millert Exp $ */
+/* $OpenBSD: ansi.h,v 1.10 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: ansi.h,v 1.6 1996/11/15 22:38:45 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h
index a6d4d73859a..41052e647f6 100644
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.20 2002/08/24 17:21:45 matthieu Exp $ */
+/* $OpenBSD: cpu.h,v 1.21 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */
/*-
@@ -55,11 +55,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/fbio.h b/sys/arch/alpha/include/fbio.h
index b72df82a767..79104661b4e 100644
--- a/sys/arch/alpha/include/fbio.h
+++ b/sys/arch/alpha/include/fbio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fbio.h,v 1.4 2001/09/16 00:42:44 millert Exp $ */
+/* $OpenBSD: fbio.h,v 1.5 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: fbio.h,v 1.3 1996/08/23 00:50:25 cgd Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/float.h b/sys/arch/alpha/include/float.h
index be1aa9d9b6c..94fa7b2ecb1 100644
--- a/sys/arch/alpha/include/float.h
+++ b/sys/arch/alpha/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.5 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: float.h,v 1.6 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: float.h,v 1.4 1995/06/20 20:45:22 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/ieee.h b/sys/arch/alpha/include/ieee.h
index 943ac5052e8..e5ed1da001d 100644
--- a/sys/arch/alpha/include/ieee.h
+++ b/sys/arch/alpha/include/ieee.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee.h,v 1.3 1996/10/30 22:39:07 niklas Exp $ */
+/* $OpenBSD: ieee.h,v 1.4 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: ieee.h,v 1.1 1995/02/13 23:07:40 cgd Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/kbio.h b/sys/arch/alpha/include/kbio.h
index 30dc944ba83..e5da923b156 100644
--- a/sys/arch/alpha/include/kbio.h
+++ b/sys/arch/alpha/include/kbio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kbio.h,v 1.3 1996/10/30 22:39:11 niklas Exp $ */
+/* $OpenBSD: kbio.h,v 1.4 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: kbio.h,v 1.1 1996/04/12 01:45:45 cgd Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/limits.h b/sys/arch/alpha/include/limits.h
index aad0841dfeb..332bcb88c1c 100644
--- a/sys/arch/alpha/include/limits.h
+++ b/sys/arch/alpha/include/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.9 2002/07/30 01:21:59 millert Exp $ */
+/* $OpenBSD: limits.h,v 1.10 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: limits.h,v 1.2 1996/04/12 01:38:25 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h
index a8a4fd7b901..efc930b88e5 100644
--- a/sys/arch/alpha/include/param.h
+++ b/sys/arch/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.22 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: param.h,v 1.23 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: param.h,v 1.30 2000/06/09 16:03:04 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/pmap.h b/sys/arch/alpha/include/pmap.h
index d70588646a4..0f166ecdb89 100644
--- a/sys/arch/alpha/include/pmap.h
+++ b/sys/arch/alpha/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.13 2002/09/12 12:50:47 art Exp $ */
+/* $OpenBSD: pmap.h,v 1.14 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: pmap.h,v 1.37 2000/11/19 03:16:35 thorpej Exp $ */
/*-
@@ -55,11 +55,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/stdarg.h b/sys/arch/alpha/include/stdarg.h
index db4c584eaa1..92fa852c129 100644
--- a/sys/arch/alpha/include/stdarg.h
+++ b/sys/arch/alpha/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.5 2002/10/23 15:38:15 millert Exp $ */
+/* $OpenBSD: stdarg.h,v 1.6 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: stdarg.h,v 1.4 1996/10/09 21:13:05 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/types.h b/sys/arch/alpha/include/types.h
index ec20d662056..1967be2ba53 100644
--- a/sys/arch/alpha/include/types.h
+++ b/sys/arch/alpha/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.11 2001/09/01 05:48:18 jason Exp $ */
+/* $OpenBSD: types.h,v 1.12 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: types.h,v 1.6 1996/12/05 00:13:47 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/varargs.h b/sys/arch/alpha/include/varargs.h
index 38be90fdf3d..9d8a5d775ed 100644
--- a/sys/arch/alpha/include/varargs.h
+++ b/sys/arch/alpha/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.4 1996/10/30 22:39:33 niklas Exp $ */
+/* $OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: varargs.h,v 1.5 1996/10/09 21:13:05 cgd Exp $ */
/*-
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/vmparam.h b/sys/arch/alpha/include/vmparam.h
index 4afae8f0eaf..950df071e4c 100644
--- a/sys/arch/alpha/include/vmparam.h
+++ b/sys/arch/alpha/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.10 2002/02/17 22:59:52 maja Exp $ */
+/* $OpenBSD: vmparam.h,v 1.11 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: vmparam.h,v 1.18 2000/05/22 17:13:54 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/include/vuid_event.h b/sys/arch/alpha/include/vuid_event.h
index 833040b542e..951913e373c 100644
--- a/sys/arch/alpha/include/vuid_event.h
+++ b/sys/arch/alpha/include/vuid_event.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vuid_event.h,v 1.3 1996/10/30 22:39:35 niklas Exp $ */
+/* $OpenBSD: vuid_event.h,v 1.4 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: vuid_event.h,v 1.1 1996/04/12 01:45:47 cgd Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/isa/timerreg.h b/sys/arch/alpha/isa/timerreg.h
index 7314fb10dde..e7fd980ea72 100644
--- a/sys/arch/alpha/isa/timerreg.h
+++ b/sys/arch/alpha/isa/timerreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: timerreg.h,v 1.3 1996/10/30 22:39:44 niklas Exp $ */
+/* $OpenBSD: timerreg.h,v 1.4 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: timerreg.h,v 1.1 1996/04/12 01:54:56 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c
index 612d2ce60e4..c9633fc6ea1 100644
--- a/sys/arch/alpha/stand/boot/boot.c
+++ b/sys/arch/alpha/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.14 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: boot.c,v 1.15 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: boot.c,v 1.10 1997/01/18 01:58:33 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/stand/boot/conf.c b/sys/arch/alpha/stand/boot/conf.c
index 84063c8dfc0..608a4b61c8f 100644
--- a/sys/arch/alpha/stand/boot/conf.c
+++ b/sys/arch/alpha/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.5 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: conf.c,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: conf.c,v 1.3 1995/11/23 02:39:31 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/stand/boot/devopen.c b/sys/arch/alpha/stand/boot/devopen.c
index cc99b555520..9c1871c6ecc 100644
--- a/sys/arch/alpha/stand/boot/devopen.c
+++ b/sys/arch/alpha/stand/boot/devopen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: devopen.c,v 1.7 1998/09/04 16:57:16 millert Exp $ */
+/* $OpenBSD: devopen.c,v 1.8 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: devopen.c,v 1.1 1995/11/23 02:39:37 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/stand/boot/disk.c b/sys/arch/alpha/stand/boot/disk.c
index 641f2f87ee0..58f186f0cc7 100644
--- a/sys/arch/alpha/stand/boot/disk.c
+++ b/sys/arch/alpha/stand/boot/disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.c,v 1.10 2001/09/16 01:34:32 art Exp $ */
+/* $OpenBSD: disk.c,v 1.11 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: disk.c,v 1.6 1997/04/06 08:40:33 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/stand/boot/newvers.sh b/sys/arch/alpha/stand/boot/newvers.sh
index 606b4031760..52d98972d37 100644
--- a/sys/arch/alpha/stand/boot/newvers.sh
+++ b/sys/arch/alpha/stand/boot/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.6 1997/05/04 20:31:41 millert Exp $
+# $OpenBSD: newvers.sh,v 1.7 2003/06/02 23:27:44 millert Exp $
# $NetBSD: newvers.sh,v 1.3 1996/06/14 20:03:04 cgd Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -14,11 +14,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/alpha/stand/loadfile.c b/sys/arch/alpha/stand/loadfile.c
index 661d8e6dd78..18083e9c370 100644
--- a/sys/arch/alpha/stand/loadfile.c
+++ b/sys/arch/alpha/stand/loadfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: loadfile.c,v 1.12 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: loadfile.c,v 1.13 2003/06/02 23:27:43 millert Exp $ */
/* $NetBSD: loadfile.c,v 1.3 1997/04/06 08:40:59 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/stand/netboot/devopen.c b/sys/arch/alpha/stand/netboot/devopen.c
index b2112adb345..d8434cf8d1a 100644
--- a/sys/arch/alpha/stand/netboot/devopen.c
+++ b/sys/arch/alpha/stand/netboot/devopen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: devopen.c,v 1.3 1997/05/05 14:39:44 millert Exp $ */
+/* $OpenBSD: devopen.c,v 1.4 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: devopen.c,v 1.3 1997/04/06 08:41:25 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/stand/netboot/netboot.c b/sys/arch/alpha/stand/netboot/netboot.c
index 164212c36bb..5ce9b560a5b 100644
--- a/sys/arch/alpha/stand/netboot/netboot.c
+++ b/sys/arch/alpha/stand/netboot/netboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netboot.c,v 1.4 2002/03/14 01:26:27 millert Exp $ */
+/* $OpenBSD: netboot.c,v 1.5 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: netboot.c,v 1.1 1996/09/18 20:03:12 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/stand/netboot/newvers.sh b/sys/arch/alpha/stand/netboot/newvers.sh
index bb3e3c51692..e24739e1875 100644
--- a/sys/arch/alpha/stand/netboot/newvers.sh
+++ b/sys/arch/alpha/stand/netboot/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.2 1997/05/04 23:40:29 millert Exp $
+# $OpenBSD: newvers.sh,v 1.3 2003/06/02 23:27:44 millert Exp $
# $NetBSD: newvers.sh,v 1.1 1996/09/18 20:03:13 cgd Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -14,11 +14,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/alpha/tc/scc.c b/sys/arch/alpha/tc/scc.c
index 706e681a18b..6832c02a312 100644
--- a/sys/arch/alpha/tc/scc.c
+++ b/sys/arch/alpha/tc/scc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scc.c,v 1.17 2003/02/11 19:20:25 mickey Exp $ */
+/* $OpenBSD: scc.c,v 1.18 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: scc.c,v 1.58 2002/03/17 19:40:27 atatat Exp $ */
/*
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/tc/sccreg.h b/sys/arch/alpha/tc/sccreg.h
index 137a255ff53..5c3af0b818d 100644
--- a/sys/arch/alpha/tc/sccreg.h
+++ b/sys/arch/alpha/tc/sccreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sccreg.h,v 1.4 2002/05/02 22:56:06 miod Exp $ */
+/* $OpenBSD: sccreg.h,v 1.5 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: sccreg.h,v 1.3 1997/04/06 22:30:30 cgd Exp $ */
/*
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/alpha/tc/sccvar.h b/sys/arch/alpha/tc/sccvar.h
index 8f24120645a..6d7f0654c2e 100644
--- a/sys/arch/alpha/tc/sccvar.h
+++ b/sys/arch/alpha/tc/sccvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sccvar.h,v 1.5 2002/05/02 22:56:06 miod Exp $ */
+/* $OpenBSD: sccvar.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: sccvar.h,v 1.7 2001/08/26 16:39:56 simonb Exp $ */
/*
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/ac.c b/sys/arch/hp300/dev/ac.c
index c2d25f066e6..79afe6b15cf 100644
--- a/sys/arch/hp300/dev/ac.c
+++ b/sys/arch/hp300/dev/ac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ac.c,v 1.12 2002/12/25 20:40:36 miod Exp $ */
+/* $OpenBSD: ac.c,v 1.13 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: ac.c,v 1.9 1997/04/02 22:37:21 scottr Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/acioctl.h b/sys/arch/hp300/dev/acioctl.h
index 1c09209f210..1184214c7c9 100644
--- a/sys/arch/hp300/dev/acioctl.h
+++ b/sys/arch/hp300/dev/acioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: acioctl.h,v 1.2 1997/01/12 15:12:18 downsj Exp $ */
+/* $OpenBSD: acioctl.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: acioctl.h,v 1.2 1994/10/26 07:23:25 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/acvar.h b/sys/arch/hp300/dev/acvar.h
index afe4c2e6eda..2680fbd05f5 100644
--- a/sys/arch/hp300/dev/acvar.h
+++ b/sys/arch/hp300/dev/acvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: acvar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: acvar.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: acvar.h,v 1.4 1997/03/31 07:32:15 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/ct.c b/sys/arch/hp300/dev/ct.c
index 979f52cd15d..d707030e46b 100644
--- a/sys/arch/hp300/dev/ct.c
+++ b/sys/arch/hp300/dev/ct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ct.c,v 1.9 2002/05/23 15:31:57 art Exp $ */
+/* $OpenBSD: ct.c,v 1.10 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: ct.c,v 1.21 1997/04/02 22:37:23 scottr Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/ctreg.h b/sys/arch/hp300/dev/ctreg.h
index 2ba97fb73b6..327f827c2c1 100644
--- a/sys/arch/hp300/dev/ctreg.h
+++ b/sys/arch/hp300/dev/ctreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctreg.h,v 1.4 1997/01/12 15:12:20 downsj Exp $ */
+/* $OpenBSD: ctreg.h,v 1.5 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: ctreg.h,v 1.6 1996/02/09 18:00:35 scottr Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c
index 78652a5b716..97c037d3fa3 100644
--- a/sys/arch/hp300/dev/dca.c
+++ b/sys/arch/hp300/dev/dca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dca.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: dca.c,v 1.16 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/dcareg.h b/sys/arch/hp300/dev/dcareg.h
index 6b65d3169ab..e8c03d7cf74 100644
--- a/sys/arch/hp300/dev/dcareg.h
+++ b/sys/arch/hp300/dev/dcareg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcareg.h,v 1.5 2001/09/23 22:01:38 millert Exp $ */
+/* $OpenBSD: dcareg.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dcareg.h,v 1.6 1996/02/24 00:55:02 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/dcm.c b/sys/arch/hp300/dev/dcm.c
index 5114370dd05..a313ccbe432 100644
--- a/sys/arch/hp300/dev/dcm.c
+++ b/sys/arch/hp300/dev/dcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcm.c,v 1.13 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: dcm.c,v 1.14 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dcm.c,v 1.41 1997/05/05 20:59:16 thorpej Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/dcmreg.h b/sys/arch/hp300/dev/dcmreg.h
index 4c7fe75e63d..5fadb0b1870 100644
--- a/sys/arch/hp300/dev/dcmreg.h
+++ b/sys/arch/hp300/dev/dcmreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcmreg.h,v 1.3 1997/01/12 15:12:23 downsj Exp $ */
+/* $OpenBSD: dcmreg.h,v 1.4 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dcmreg.h,v 1.5 1996/02/24 00:55:05 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/dma.c b/sys/arch/hp300/dev/dma.c
index 0f577c73520..d99d2b32681 100644
--- a/sys/arch/hp300/dev/dma.c
+++ b/sys/arch/hp300/dev/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.12 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: dma.c,v 1.13 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dma.c,v 1.19 1997/05/05 21:02:39 thorpej Exp $ */
/*
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/dmareg.h b/sys/arch/hp300/dev/dmareg.h
index defc90c22f4..46fb7867c7e 100644
--- a/sys/arch/hp300/dev/dmareg.h
+++ b/sys/arch/hp300/dev/dmareg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dmareg.h,v 1.7 2001/11/04 02:58:51 miod Exp $ */
+/* $OpenBSD: dmareg.h,v 1.8 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dmareg.h,v 1.12 1997/05/05 21:02:40 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/dmavar.h b/sys/arch/hp300/dev/dmavar.h
index cfb8897fa3e..0aa76903e8a 100644
--- a/sys/arch/hp300/dev/dmavar.h
+++ b/sys/arch/hp300/dev/dmavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dmavar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: dmavar.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: dmavar.h,v 1.9 1997/04/01 03:10:59 scottr Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/fhpib.c b/sys/arch/hp300/dev/fhpib.c
index aa9c9df07c2..af80c3d1433 100644
--- a/sys/arch/hp300/dev/fhpib.c
+++ b/sys/arch/hp300/dev/fhpib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fhpib.c,v 1.10 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: fhpib.c,v 1.11 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: fhpib.c,v 1.18 1997/05/05 21:04:16 thorpej Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/fhpibreg.h b/sys/arch/hp300/dev/fhpibreg.h
index 1aa1d45a781..d30661b963d 100644
--- a/sys/arch/hp300/dev/fhpibreg.h
+++ b/sys/arch/hp300/dev/fhpibreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fhpibreg.h,v 1.2 1997/01/12 15:12:30 downsj Exp $ */
+/* $OpenBSD: fhpibreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: fhpibreg.h,v 1.4 1994/10/26 07:23:45 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf.c b/sys/arch/hp300/dev/grf.c
index 8872de31e07..8f4cc5709db 100644
--- a/sys/arch/hp300/dev/grf.c
+++ b/sys/arch/hp300/dev/grf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf.c,v 1.21 2003/05/09 23:09:20 art Exp $ */
+/* $OpenBSD: grf.c,v 1.22 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf.c,v 1.30 1998/08/20 08:33:41 kleink Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_dv.c b/sys/arch/hp300/dev/grf_dv.c
index c26649795d8..cf152646d88 100644
--- a/sys/arch/hp300/dev/grf_dv.c
+++ b/sys/arch/hp300/dev/grf_dv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_dv.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: grf_dv.c,v 1.9 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_dv.c,v 1.11 1997/03/31 07:34:14 scottr Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_dvreg.h b/sys/arch/hp300/dev/grf_dvreg.h
index d156424416b..489e8fb3ef4 100644
--- a/sys/arch/hp300/dev/grf_dvreg.h
+++ b/sys/arch/hp300/dev/grf_dvreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_dvreg.h,v 1.2 1997/01/12 15:12:33 downsj Exp $ */
+/* $OpenBSD: grf_dvreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_dvreg.h,v 1.5 1994/10/26 07:23:50 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_gb.c b/sys/arch/hp300/dev/grf_gb.c
index dfb7bed13d1..1832eb58dc2 100644
--- a/sys/arch/hp300/dev/grf_gb.c
+++ b/sys/arch/hp300/dev/grf_gb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_gb.c,v 1.7 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: grf_gb.c,v 1.8 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_gb.c,v 1.11 1997/03/31 07:34:15 scottr Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_gbreg.h b/sys/arch/hp300/dev/grf_gbreg.h
index 187aeb2a9f4..44288972527 100644
--- a/sys/arch/hp300/dev/grf_gbreg.h
+++ b/sys/arch/hp300/dev/grf_gbreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_gbreg.h,v 1.2 1997/01/12 15:12:34 downsj Exp $ */
+/* $OpenBSD: grf_gbreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_gbreg.h,v 1.4 1994/10/26 07:23:53 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_hy.c b/sys/arch/hp300/dev/grf_hy.c
index 96939b98c80..94bac3bcd0d 100644
--- a/sys/arch/hp300/dev/grf_hy.c
+++ b/sys/arch/hp300/dev/grf_hy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_hy.c,v 1.8 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: grf_hy.c,v 1.9 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_hy.c,v 1.9 1997/03/31 07:34:16 scottr Exp $ */
/*
@@ -20,11 +20,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_hyreg.h b/sys/arch/hp300/dev/grf_hyreg.h
index 9e23836fc8a..0bf7c6cb936 100644
--- a/sys/arch/hp300/dev/grf_hyreg.h
+++ b/sys/arch/hp300/dev/grf_hyreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_hyreg.h,v 1.2 1997/01/12 15:12:35 downsj Exp $ */
+/* $OpenBSD: grf_hyreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_hyreg.h,v 1.2 1994/10/26 07:23:57 cgd Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_rb.c b/sys/arch/hp300/dev/grf_rb.c
index 3646030227f..95808ea44b3 100644
--- a/sys/arch/hp300/dev/grf_rb.c
+++ b/sys/arch/hp300/dev/grf_rb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_rb.c,v 1.9 2003/03/21 16:18:29 miod Exp $ */
+/* $OpenBSD: grf_rb.c,v 1.10 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_rb.c,v 1.11 1997/03/31 07:34:17 scottr Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_rbreg.h b/sys/arch/hp300/dev/grf_rbreg.h
index 98686b9eb5c..538f4f4b645 100644
--- a/sys/arch/hp300/dev/grf_rbreg.h
+++ b/sys/arch/hp300/dev/grf_rbreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_rbreg.h,v 1.2 1997/01/12 15:12:37 downsj Exp $ */
+/* $OpenBSD: grf_rbreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_rbreg.h,v 1.4 1994/10/26 07:24:03 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_tc.c b/sys/arch/hp300/dev/grf_tc.c
index 13a5f3f7ac8..d6eeff7c23a 100644
--- a/sys/arch/hp300/dev/grf_tc.c
+++ b/sys/arch/hp300/dev/grf_tc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_tc.c,v 1.10 2002/12/06 02:17:42 deraadt Exp $ */
+/* $OpenBSD: grf_tc.c,v 1.11 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_tc.c,v 1.11 1997/03/31 07:34:18 scottr Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grf_tcreg.h b/sys/arch/hp300/dev/grf_tcreg.h
index b3146f0100c..cc7c2cf0395 100644
--- a/sys/arch/hp300/dev/grf_tcreg.h
+++ b/sys/arch/hp300/dev/grf_tcreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_tcreg.h,v 1.2 1997/01/12 15:12:39 downsj Exp $ */
+/* $OpenBSD: grf_tcreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grf_tcreg.h,v 1.6 1994/10/26 07:24:06 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grfioctl.h b/sys/arch/hp300/dev/grfioctl.h
index 0ffe7a36c9a..b720e2081bb 100644
--- a/sys/arch/hp300/dev/grfioctl.h
+++ b/sys/arch/hp300/dev/grfioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grfioctl.h,v 1.3 2003/04/03 06:47:58 jmc Exp $ */
+/* $OpenBSD: grfioctl.h,v 1.4 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grfioctl.h,v 1.5 1994/10/26 07:24:08 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grfreg.h b/sys/arch/hp300/dev/grfreg.h
index e69b02df4bc..94d907a129e 100644
--- a/sys/arch/hp300/dev/grfreg.h
+++ b/sys/arch/hp300/dev/grfreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grfreg.h,v 1.2 1997/01/12 15:12:40 downsj Exp $ */
+/* $OpenBSD: grfreg.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grfreg.h,v 1.2 1994/10/26 07:24:09 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/grfvar.h b/sys/arch/hp300/dev/grfvar.h
index 59ebc83f359..80476f09837 100644
--- a/sys/arch/hp300/dev/grfvar.h
+++ b/sys/arch/hp300/dev/grfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grfvar.h,v 1.8 2002/03/14 03:15:52 millert Exp $ */
+/* $OpenBSD: grfvar.h,v 1.9 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: grfvar.h,v 1.10 1997/03/31 07:34:19 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 0867e7948f3..a71bd88d24d 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hd.c,v 1.22 2003/04/06 15:28:25 krw Exp $ */
+/* $OpenBSD: hd.c,v 1.23 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hdreg.h b/sys/arch/hp300/dev/hdreg.h
index 0ffa53a09e4..ed7868addd3 100644
--- a/sys/arch/hp300/dev/hdreg.h
+++ b/sys/arch/hp300/dev/hdreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hdreg.h,v 1.1 1997/02/03 08:11:55 downsj Exp $ */
+/* $OpenBSD: hdreg.h,v 1.2 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: rdreg.h,v 1.7 1996/02/09 18:00:37 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hdvar.h b/sys/arch/hp300/dev/hdvar.h
index a69b31f3d18..a0548f910eb 100644
--- a/sys/arch/hp300/dev/hdvar.h
+++ b/sys/arch/hp300/dev/hdvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hdvar.h,v 1.4 2002/12/25 20:56:59 miod Exp $ */
+/* $OpenBSD: hdvar.h,v 1.5 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: rdvar.h,v 1.6 1997/01/30 09:14:19 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hil.c b/sys/arch/hp300/dev/hil.c
index 167aa7ccd2a..0785e4f08bb 100644
--- a/sys/arch/hp300/dev/hil.c
+++ b/sys/arch/hp300/dev/hil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hil.c,v 1.17 2003/02/02 02:56:26 miod Exp $ */
+/* $OpenBSD: hil.c,v 1.18 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hil.c,v 1.34 1997/04/02 22:37:32 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hil_keymaps.c b/sys/arch/hp300/dev/hil_keymaps.c
index 514b9222806..a1207a3e9f0 100644
--- a/sys/arch/hp300/dev/hil_keymaps.c
+++ b/sys/arch/hp300/dev/hil_keymaps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hil_keymaps.c,v 1.4 1997/04/16 11:56:07 downsj Exp $ */
+/* $OpenBSD: hil_keymaps.c,v 1.5 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hil_keymaps.c,v 1.7 1997/03/31 07:34:22 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hilioctl.h b/sys/arch/hp300/dev/hilioctl.h
index 54c7ba453c4..fa75e5ba01c 100644
--- a/sys/arch/hp300/dev/hilioctl.h
+++ b/sys/arch/hp300/dev/hilioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hilioctl.h,v 1.2 1997/01/12 15:12:43 downsj Exp $ */
+/* $OpenBSD: hilioctl.h,v 1.3 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hilioctl.h,v 1.6 1994/10/26 07:24:14 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hilreg.h b/sys/arch/hp300/dev/hilreg.h
index 453689a2800..2b2f7737c78 100644
--- a/sys/arch/hp300/dev/hilreg.h
+++ b/sys/arch/hp300/dev/hilreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hilreg.h,v 1.3 1997/02/04 06:21:24 downsj Exp $ */
+/* $OpenBSD: hilreg.h,v 1.4 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hilreg.h,v 1.6 1997/02/02 09:39:21 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hilvar.h b/sys/arch/hp300/dev/hilvar.h
index 23eaf2a9549..5e9e6195e1c 100644
--- a/sys/arch/hp300/dev/hilvar.h
+++ b/sys/arch/hp300/dev/hilvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hilvar.h,v 1.5 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: hilvar.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hilvar.h,v 1.14 1997/04/01 19:29:10 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hpib.c b/sys/arch/hp300/dev/hpib.c
index 1c0f75f8ff5..3ef5983265f 100644
--- a/sys/arch/hp300/dev/hpib.c
+++ b/sys/arch/hp300/dev/hpib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpib.c,v 1.9 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: hpib.c,v 1.10 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hpib.c,v 1.16 1997/04/27 20:58:57 thorpej Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/hpibvar.h b/sys/arch/hp300/dev/hpibvar.h
index 220a55e2b3d..70c1e40587d 100644
--- a/sys/arch/hp300/dev/hpibvar.h
+++ b/sys/arch/hp300/dev/hpibvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpibvar.h,v 1.7 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: hpibvar.h,v 1.8 2003/06/02 23:27:44 millert Exp $ */
/* $NetBSD: hpibvar.h,v 1.10 1997/03/31 07:34:25 scottr Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/if_le.c b/sys/arch/hp300/dev/if_le.c
index 81937267e6c..0934fc88efc 100644
--- a/sys/arch/hp300/dev/if_le.c
+++ b/sys/arch/hp300/dev/if_le.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: if_le.c,v 1.15 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: if_le.c,v 1.43 1997/05/05 21:05:32 thorpej Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/if_lereg.h b/sys/arch/hp300/dev/if_lereg.h
index 7bb7fcc24c9..1f4247b7b1f 100644
--- a/sys/arch/hp300/dev/if_lereg.h
+++ b/sys/arch/hp300/dev/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.3 1997/01/12 15:12:46 downsj Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.4 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: if_lereg.h,v 1.8 1995/12/10 00:49:36 mycroft Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/if_levar.h b/sys/arch/hp300/dev/if_levar.h
index 29e401a890d..3b18cc3d140 100644
--- a/sys/arch/hp300/dev/if_levar.h
+++ b/sys/arch/hp300/dev/if_levar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_levar.h,v 1.5 1997/04/16 11:56:10 downsj Exp $ */
+/* $OpenBSD: if_levar.h,v 1.6 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: if_levar.h,v 1.8 1997/04/14 02:30:45 thorpej Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/iotypes.h b/sys/arch/hp300/dev/iotypes.h
index c21e717af95..7a52a188bb8 100644
--- a/sys/arch/hp300/dev/iotypes.h
+++ b/sys/arch/hp300/dev/iotypes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: iotypes.h,v 1.2 1997/01/12 15:12:48 downsj Exp $ */
+/* $OpenBSD: iotypes.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: iotypes.h,v 1.2 1994/10/26 07:24:24 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/ite.c b/sys/arch/hp300/dev/ite.c
index 8bae218cee2..58bd3ed7174 100644
--- a/sys/arch/hp300/dev/ite.c
+++ b/sys/arch/hp300/dev/ite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: ite.c,v 1.15 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: ite.c,v 1.38 1997/03/31 07:37:25 scottr Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/ite_subr.c b/sys/arch/hp300/dev/ite_subr.c
index b30695517fa..da5ae8033b1 100644
--- a/sys/arch/hp300/dev/ite_subr.c
+++ b/sys/arch/hp300/dev/ite_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_subr.c,v 1.4 1997/04/16 11:56:11 downsj Exp $ */
+/* $OpenBSD: ite_subr.c,v 1.5 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: ite_subr.c,v 1.8 1997/03/31 07:37:26 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/itereg.h b/sys/arch/hp300/dev/itereg.h
index 3ccb0c0f88e..6f7967c6891 100644
--- a/sys/arch/hp300/dev/itereg.h
+++ b/sys/arch/hp300/dev/itereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: itereg.h,v 1.2 1997/01/12 15:12:52 downsj Exp $ */
+/* $OpenBSD: itereg.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: itereg.h,v 1.5 1994/10/26 07:24:39 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/itevar.h b/sys/arch/hp300/dev/itevar.h
index c5d7c652acf..3c321b7efdf 100644
--- a/sys/arch/hp300/dev/itevar.h
+++ b/sys/arch/hp300/dev/itevar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: itevar.h,v 1.10 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: itevar.h,v 1.11 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: itevar.h,v 1.14 1997/03/31 07:37:27 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/kbdmap.h b/sys/arch/hp300/dev/kbdmap.h
index c48ce3adcea..ee5eebddf27 100644
--- a/sys/arch/hp300/dev/kbdmap.h
+++ b/sys/arch/hp300/dev/kbdmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kbdmap.h,v 1.3 1997/01/12 15:12:53 downsj Exp $ */
+/* $OpenBSD: kbdmap.h,v 1.4 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: kbdmap.h,v 1.7 1996/10/05 05:22:11 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/maskbits.h b/sys/arch/hp300/dev/maskbits.h
index db2f2e79380..bf116c92d47 100644
--- a/sys/arch/hp300/dev/maskbits.h
+++ b/sys/arch/hp300/dev/maskbits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: maskbits.h,v 1.3 1997/04/16 11:56:12 downsj Exp $ */
+/* $OpenBSD: maskbits.h,v 1.4 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: maskbits.h,v 1.3 1997/03/31 07:37:28 scottr Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/nhpib.c b/sys/arch/hp300/dev/nhpib.c
index 4d4be010427..3f6482f17de 100644
--- a/sys/arch/hp300/dev/nhpib.c
+++ b/sys/arch/hp300/dev/nhpib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nhpib.c,v 1.11 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: nhpib.c,v 1.12 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: nhpib.c,v 1.17 1997/05/05 21:06:41 thorpej Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/nhpibreg.h b/sys/arch/hp300/dev/nhpibreg.h
index e80cdabfaa8..5a580cdea4c 100644
--- a/sys/arch/hp300/dev/nhpibreg.h
+++ b/sys/arch/hp300/dev/nhpibreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nhpibreg.h,v 1.2 1997/01/12 15:12:56 downsj Exp $ */
+/* $OpenBSD: nhpibreg.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: nhpibreg.h,v 1.5 1995/01/07 10:30:15 mycroft Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/ppi.c b/sys/arch/hp300/dev/ppi.c
index ca30436f61f..11e7574a4c3 100644
--- a/sys/arch/hp300/dev/ppi.c
+++ b/sys/arch/hp300/dev/ppi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppi.c,v 1.10 2002/06/09 05:23:26 miod Exp $ */
+/* $OpenBSD: ppi.c,v 1.11 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: ppi.c,v 1.13 1997/04/02 22:37:33 scottr Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/ppiioctl.h b/sys/arch/hp300/dev/ppiioctl.h
index 52d0dcf3cff..4a0acc8fea9 100644
--- a/sys/arch/hp300/dev/ppiioctl.h
+++ b/sys/arch/hp300/dev/ppiioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppiioctl.h,v 1.2 1997/01/12 15:12:58 downsj Exp $ */
+/* $OpenBSD: ppiioctl.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: ppiioctl.h,v 1.4 1994/10/26 07:24:48 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/scsi.c b/sys/arch/hp300/dev/scsi.c
index ffddff19c3a..50fed565e99 100644
--- a/sys/arch/hp300/dev/scsi.c
+++ b/sys/arch/hp300/dev/scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi.c,v 1.14 2003/04/03 17:01:29 millert Exp $ */
+/* $OpenBSD: scsi.c,v 1.15 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: scsi.c,v 1.21 1997/05/05 21:08:26 thorpej Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/scsireg.h b/sys/arch/hp300/dev/scsireg.h
index 2ddbc961f4f..03a246c4660 100644
--- a/sys/arch/hp300/dev/scsireg.h
+++ b/sys/arch/hp300/dev/scsireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsireg.h,v 1.2 1997/01/12 15:13:02 downsj Exp $ */
+/* $OpenBSD: scsireg.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: scsireg.h,v 1.4 1994/10/26 07:24:59 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/scsivar.h b/sys/arch/hp300/dev/scsivar.h
index 2a8634fd733..6beeeae655f 100644
--- a/sys/arch/hp300/dev/scsivar.h
+++ b/sys/arch/hp300/dev/scsivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsivar.h,v 1.6 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: scsivar.h,v 1.7 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: scsivar.h,v 1.7 1997/03/31 07:40:05 scottr Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/sd.c b/sys/arch/hp300/dev/sd.c
index fda61269fbc..5a02b64aac5 100644
--- a/sys/arch/hp300/dev/sd.c
+++ b/sys/arch/hp300/dev/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.29 2003/04/06 15:28:25 krw Exp $ */
+/* $OpenBSD: sd.c,v 1.30 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: sd.c,v 1.34 1997/07/10 18:14:10 kleink Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/sdvar.h b/sys/arch/hp300/dev/sdvar.h
index 5be443977c5..e74377b04e3 100644
--- a/sys/arch/hp300/dev/sdvar.h
+++ b/sys/arch/hp300/dev/sdvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sdvar.h,v 1.11 2002/12/25 20:56:59 miod Exp $ */
+/* $OpenBSD: sdvar.h,v 1.12 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: sdvar.h,v 1.7 1997/03/31 07:40:07 scottr Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/st.c b/sys/arch/hp300/dev/st.c
index 9e0d1b5a8b7..a66e857da4f 100644
--- a/sys/arch/hp300/dev/st.c
+++ b/sys/arch/hp300/dev/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.15 2002/12/25 20:40:36 miod Exp $ */
+/* $OpenBSD: st.c,v 1.16 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: st.c,v 1.22 1997/04/02 22:37:38 scottr Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/dev/stvar.h b/sys/arch/hp300/dev/stvar.h
index 81b2fc0bca9..d2e3eb38f37 100644
--- a/sys/arch/hp300/dev/stvar.h
+++ b/sys/arch/hp300/dev/stvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stvar.h,v 1.4 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: stvar.h,v 1.5 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: stvar.h,v 1.6 1997/04/02 22:37:40 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c
index d19e71cb05e..4f429cec6c8 100644
--- a/sys/arch/hp300/hp300/autoconf.c
+++ b/sys/arch/hp300/hp300/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.24 2003/05/10 21:11:12 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.25 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: autoconf.c,v 1.45 1999/04/10 17:31:02 kleink Exp $ */
/*
@@ -31,11 +31,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/clock.c b/sys/arch/hp300/hp300/clock.c
index a203b504ea0..fdc47ebb04e 100644
--- a/sys/arch/hp300/hp300/clock.c
+++ b/sys/arch/hp300/hp300/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.8 2003/02/11 19:20:25 mickey Exp $ */
+/* $OpenBSD: clock.c,v 1.9 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: clock.c,v 1.20 1997/04/27 20:43:38 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/clockreg.h b/sys/arch/hp300/hp300/clockreg.h
index 0d12987e580..805974d0005 100644
--- a/sys/arch/hp300/hp300/clockreg.h
+++ b/sys/arch/hp300/hp300/clockreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clockreg.h,v 1.3 2003/02/11 19:20:26 mickey Exp $ */
+/* $OpenBSD: clockreg.h,v 1.4 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: clockreg.h,v 1.5 1994/10/26 07:25:26 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 1333c06260f..92d6b952c7e 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.32 2003/05/14 00:20:37 tedu Exp $ */
+/* $OpenBSD: conf.c,v 1.33 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/disksubr.c b/sys/arch/hp300/hp300/disksubr.c
index e73db840847..a91cdbd87e1 100644
--- a/sys/arch/hp300/hp300/disksubr.c
+++ b/sys/arch/hp300/hp300/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.14 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: disksubr.c,v 1.15 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: disksubr.c,v 1.9 1997/04/01 03:12:13 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/dkbad.c b/sys/arch/hp300/hp300/dkbad.c
index d9eb4f4bb6a..69c9c7fde86 100644
--- a/sys/arch/hp300/hp300/dkbad.c
+++ b/sys/arch/hp300/hp300/dkbad.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dkbad.c,v 1.5 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: dkbad.c,v 1.6 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: dkbad.c,v 1.5 1997/04/01 03:12:15 scottr Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/genassym.cf b/sys/arch/hp300/hp300/genassym.cf
index 1a1b23ae31f..fb31fd4b28d 100644
--- a/sys/arch/hp300/hp300/genassym.cf
+++ b/sys/arch/hp300/hp300/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.18 2002/04/25 22:32:02 miod Exp $
+# $OpenBSD: genassym.cf,v 1.19 2003/06/02 23:27:45 millert Exp $
# $NetBSD: genassym.cf,v 1.11 1998/02/16 20:58:29 thorpej Exp $
#
@@ -13,11 +13,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/hp300/hp300/kgdb_machdep.c b/sys/arch/hp300/hp300/kgdb_machdep.c
index fd5ad87b54b..3a91f96e648 100644
--- a/sys/arch/hp300/hp300/kgdb_machdep.c
+++ b/sys/arch/hp300/hp300/kgdb_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kgdb_machdep.c,v 1.2 2001/05/11 23:24:57 millert Exp $ */
+/* $OpenBSD: kgdb_machdep.c,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: kgdb_machdep.c,v 1.1 1997/05/05 20:51:05 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/leds.c b/sys/arch/hp300/hp300/leds.c
index 5c59c2a8bb5..5de4a8d1a1c 100644
--- a/sys/arch/hp300/hp300/leds.c
+++ b/sys/arch/hp300/hp300/leds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: leds.c,v 1.6 2001/12/06 18:53:01 millert Exp $ */
+/* $OpenBSD: leds.c,v 1.7 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: leds.c,v 1.1 1997/05/05 20:54:35 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/leds.h b/sys/arch/hp300/hp300/leds.h
index 53fdd659b5d..7efdf727a47 100644
--- a/sys/arch/hp300/hp300/leds.h
+++ b/sys/arch/hp300/hp300/leds.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: leds.h,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: leds.h,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: leds.h,v 1.1 1997/05/05 20:54:36 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s
index 92765f66c7f..3d506dd112a 100644
--- a/sys/arch/hp300/hp300/locore.s
+++ b/sys/arch/hp300/hp300/locore.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.s,v 1.36 2003/06/02 18:47:58 deraadt Exp $ */
+/* $OpenBSD: locore.s,v 1.37 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: locore.s,v 1.91 1998/11/11 06:41:25 thorpej Exp $ */
/*
@@ -42,11 +42,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index d3b54432d9b..9e2b9d17d84 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.86 2003/05/09 23:10:21 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.87 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: machdep.c,v 1.121 1999/03/26 23:41:29 mycroft Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/mem.c b/sys/arch/hp300/hp300/mem.c
index 805a218c78b..a8241915fbe 100644
--- a/sys/arch/hp300/hp300/mem.c
+++ b/sys/arch/hp300/hp300/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.20 2002/04/28 15:17:07 miod Exp $ */
+/* $OpenBSD: mem.c,v 1.21 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: mem.c,v 1.25 1999/03/27 00:30:06 mycroft Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/pmap_bootstrap.c b/sys/arch/hp300/hp300/pmap_bootstrap.c
index 963d048210f..ab83685c7f2 100644
--- a/sys/arch/hp300/hp300/pmap_bootstrap.c
+++ b/sys/arch/hp300/hp300/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.17 2002/10/12 01:09:43 krw Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.18 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: pmap_bootstrap.c,v 1.13 1997/06/10 18:56:50 veego Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/sys_machdep.c b/sys/arch/hp300/hp300/sys_machdep.c
index 2d04cc2d06a..e1384e3fb0d 100644
--- a/sys/arch/hp300/hp300/sys_machdep.c
+++ b/sys/arch/hp300/hp300/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.11 2001/11/06 19:53:14 miod Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.12 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: sys_machdep.c,v 1.17 1997/05/19 10:15:00 veego Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/trap.c b/sys/arch/hp300/hp300/trap.c
index 8624321e778..cff9b9c3c5d 100644
--- a/sys/arch/hp300/hp300/trap.c
+++ b/sys/arch/hp300/hp300/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.41 2003/06/02 18:47:58 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.42 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: trap.c,v 1.57 1998/02/16 20:58:31 thorpej Exp $ */
/*
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/hp300/vm_machdep.c b/sys/arch/hp300/hp300/vm_machdep.c
index 48b718a287c..7c9f73b97e4 100644
--- a/sys/arch/hp300/hp300/vm_machdep.c
+++ b/sys/arch/hp300/hp300/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.34 2001/12/06 18:52:38 millert Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.35 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: vm_machdep.c,v 1.60 2001/07/06 05:53:35 chs Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/include/cpu.h b/sys/arch/hp300/include/cpu.h
index 66b7a8d1b12..4abb9721d78 100644
--- a/sys/arch/hp300/include/cpu.h
+++ b/sys/arch/hp300/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.21 2003/02/11 19:20:26 mickey Exp $ */
+/* $OpenBSD: cpu.h,v 1.22 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: cpu.h,v 1.28 1998/02/13 07:41:51 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/include/param.h b/sys/arch/hp300/include/param.h
index 18997fccdc7..20e3a05a658 100644
--- a/sys/arch/hp300/include/param.h
+++ b/sys/arch/hp300/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.22 2003/04/03 17:01:29 millert Exp $ */
+/* $OpenBSD: param.h,v 1.23 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: param.h,v 1.35 1997/07/10 08:22:38 veego Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/include/pcb.h b/sys/arch/hp300/include/pcb.h
index 6ccf7a40d7d..5e1113e0934 100644
--- a/sys/arch/hp300/include/pcb.h
+++ b/sys/arch/hp300/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.3 2002/10/10 17:00:57 pvalchev Exp $ */
+/* $OpenBSD: pcb.h,v 1.4 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: pcb.h,v 1.8 1995/05/12 12:55:17 mycroft Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/include/proc.h b/sys/arch/hp300/include/proc.h
index 64037824f3e..862bd4ae41b 100644
--- a/sys/arch/hp300/include/proc.h
+++ b/sys/arch/hp300/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.4 1997/03/26 08:32:47 downsj Exp $ */
+/* $OpenBSD: proc.h,v 1.5 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: proc.h,v 1.7 1997/03/16 09:41:36 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/include/vmparam.h b/sys/arch/hp300/include/vmparam.h
index 063e473448a..247bc35867a 100644
--- a/sys/arch/hp300/include/vmparam.h
+++ b/sys/arch/hp300/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.13 2003/01/27 19:37:27 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.14 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: vmparam.h,v 1.16 1998/08/20 08:33:48 kleink Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/cdboot/cdboot.c b/sys/arch/hp300/stand/cdboot/cdboot.c
index 5f3d625011f..549bc006f79 100644
--- a/sys/arch/hp300/stand/cdboot/cdboot.c
+++ b/sys/arch/hp300/stand/cdboot/cdboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cdboot.c,v 1.4 2003/04/03 17:01:29 millert Exp $ */
+/* $OpenBSD: cdboot.c,v 1.5 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: uboot.c,v 1.3 1997/04/27 21:17:13 thorpej Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/cdboot/conf.c b/sys/arch/hp300/stand/cdboot/conf.c
index a9d93545a27..6d9f7dc1196 100644
--- a/sys/arch/hp300/stand/cdboot/conf.c
+++ b/sys/arch/hp300/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: conf.c,v 1.3 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: conf.c,v 1.12 1996/10/14 07:29:15 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/cdboot/cons.c b/sys/arch/hp300/stand/cdboot/cons.c
index 944daf3c5e2..d73c1dbe4fa 100644
--- a/sys/arch/hp300/stand/cdboot/cons.c
+++ b/sys/arch/hp300/stand/cdboot/cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.c,v 1.1 1999/08/16 09:43:08 downsj Exp $ */
+/* $OpenBSD: cons.c,v 1.2 2003/06/02 23:27:45 millert Exp $ */
/* $NetBSD: cons.c,v 1.2 1997/05/12 07:44:53 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/apci.c b/sys/arch/hp300/stand/common/apci.c
index 3d8257767ff..80487ef5e62 100644
--- a/sys/arch/hp300/stand/common/apci.c
+++ b/sys/arch/hp300/stand/common/apci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apci.c,v 1.3 2001/05/10 21:59:39 millert Exp $ */
+/* $OpenBSD: apci.c,v 1.4 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: apci.c,v 1.2 1997/10/04 17:20:15 thorpej Exp $ */
/*-
@@ -54,11 +54,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/autoconf.c b/sys/arch/hp300/stand/common/autoconf.c
index 3c105ce3d2b..3348a3a349d 100644
--- a/sys/arch/hp300/stand/common/autoconf.c
+++ b/sys/arch/hp300/stand/common/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.2 1997/11/06 19:42:42 millert Exp $ */
+/* $OpenBSD: autoconf.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: autoconf.c,v 1.12 1997/01/30 10:32:51 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/cons.c b/sys/arch/hp300/stand/common/cons.c
index 4132a82c053..555d85df4dd 100644
--- a/sys/arch/hp300/stand/common/cons.c
+++ b/sys/arch/hp300/stand/common/cons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cons.c,v 1.1 1997/07/14 08:14:08 downsj Exp $ */
+/* $OpenBSD: cons.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: cons.c,v 1.2 1997/05/12 07:44:53 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/ct.c b/sys/arch/hp300/stand/common/ct.c
index a974c4e95e1..a7c92778d1c 100644
--- a/sys/arch/hp300/stand/common/ct.c
+++ b/sys/arch/hp300/stand/common/ct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ct.c,v 1.1 1997/07/14 08:14:09 downsj Exp $ */
+/* $OpenBSD: ct.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: ct.c,v 1.9 1996/10/14 07:29:57 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/dca.c b/sys/arch/hp300/stand/common/dca.c
index 690df01c1fe..fc1d4c4ea2e 100644
--- a/sys/arch/hp300/stand/common/dca.c
+++ b/sys/arch/hp300/stand/common/dca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dca.c,v 1.1 1997/07/14 08:14:10 downsj Exp $ */
+/* $OpenBSD: dca.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: dca.c,v 1.10 1996/10/06 01:42:48 mycroft Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/dcm.c b/sys/arch/hp300/stand/common/dcm.c
index 3dfb4d56e1a..8247ad5f55b 100644
--- a/sys/arch/hp300/stand/common/dcm.c
+++ b/sys/arch/hp300/stand/common/dcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcm.c,v 1.1 1997/07/14 08:14:11 downsj Exp $ */
+/* $OpenBSD: dcm.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: dcm.c,v 1.2 1997/04/14 05:58:32 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/fhpib.c b/sys/arch/hp300/stand/common/fhpib.c
index e266adccdf2..7f695d6fb42 100644
--- a/sys/arch/hp300/stand/common/fhpib.c
+++ b/sys/arch/hp300/stand/common/fhpib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fhpib.c,v 1.1 1997/07/14 08:14:12 downsj Exp $ */
+/* $OpenBSD: fhpib.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: fhpib.c,v 1.5 1995/08/05 16:47:42 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/hd.c b/sys/arch/hp300/stand/common/hd.c
index 71e3e8007ce..48d540d7cc0 100644
--- a/sys/arch/hp300/stand/common/hd.c
+++ b/sys/arch/hp300/stand/common/hd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hd.c,v 1.1 1997/07/14 08:14:13 downsj Exp $ */
+/* $OpenBSD: hd.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: rd.c,v 1.11 1996/12/21 21:34:40 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/hil.c b/sys/arch/hp300/stand/common/hil.c
index 55b6efb4333..08091876d33 100644
--- a/sys/arch/hp300/stand/common/hil.c
+++ b/sys/arch/hp300/stand/common/hil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hil.c,v 1.1 1997/07/14 08:14:15 downsj Exp $ */
+/* $OpenBSD: hil.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: hil.c,v 1.2 1997/04/14 19:00:10 thorpej Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/hpib.c b/sys/arch/hp300/stand/common/hpib.c
index bb0d283e766..64858e97d8f 100644
--- a/sys/arch/hp300/stand/common/hpib.c
+++ b/sys/arch/hp300/stand/common/hpib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpib.c,v 1.1 1997/07/14 08:14:15 downsj Exp $ */
+/* $OpenBSD: hpib.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: hpib.c,v 1.2 1997/05/12 07:48:23 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/ite.c b/sys/arch/hp300/stand/common/ite.c
index 4336a687b8b..2dd0784bdbb 100644
--- a/sys/arch/hp300/stand/common/ite.c
+++ b/sys/arch/hp300/stand/common/ite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: ite.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: ite.c,v 1.12 1997/01/30 10:32:55 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/ite_dv.c b/sys/arch/hp300/stand/common/ite_dv.c
index 94b7b122aa5..9cf97e24fc0 100644
--- a/sys/arch/hp300/stand/common/ite_dv.c
+++ b/sys/arch/hp300/stand/common/ite_dv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_dv.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: ite_dv.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: ite_dv.c,v 1.8 1996/03/03 04:23:35 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/ite_gb.c b/sys/arch/hp300/stand/common/ite_gb.c
index 6e9155187a7..c738d01f1ec 100644
--- a/sys/arch/hp300/stand/common/ite_gb.c
+++ b/sys/arch/hp300/stand/common/ite_gb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_gb.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: ite_gb.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: ite_gb.c,v 1.8 1996/03/03 04:23:36 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/ite_hy.c b/sys/arch/hp300/stand/common/ite_hy.c
index b2567975d1b..b903b3c2f04 100644
--- a/sys/arch/hp300/stand/common/ite_hy.c
+++ b/sys/arch/hp300/stand/common/ite_hy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_hy.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: ite_hy.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: ite_hy.c,v 1.3 1996/03/03 04:23:37 thorpej Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/ite_rb.c b/sys/arch/hp300/stand/common/ite_rb.c
index ac44237c144..1901915d5c1 100644
--- a/sys/arch/hp300/stand/common/ite_rb.c
+++ b/sys/arch/hp300/stand/common/ite_rb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_rb.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: ite_rb.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: ite_rb.c,v 1.8 1996/03/03 04:23:38 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/ite_subr.c b/sys/arch/hp300/stand/common/ite_subr.c
index d0db2c5b424..422b6b870ad 100644
--- a/sys/arch/hp300/stand/common/ite_subr.c
+++ b/sys/arch/hp300/stand/common/ite_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_subr.c,v 1.1 1997/07/14 08:14:22 downsj Exp $ */
+/* $OpenBSD: ite_subr.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: ite_subr.c,v 1.8 1996/03/03 04:23:40 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/ite_tc.c b/sys/arch/hp300/stand/common/ite_tc.c
index 52b9e374fc5..27a6009fbce 100644
--- a/sys/arch/hp300/stand/common/ite_tc.c
+++ b/sys/arch/hp300/stand/common/ite_tc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_tc.c,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: ite_tc.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: ite_tc.c,v 1.8 1996/03/03 04:23:41 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/machdep.c b/sys/arch/hp300/stand/common/machdep.c
index 6c11ad64bc4..f739959ff7a 100644
--- a/sys/arch/hp300/stand/common/machdep.c
+++ b/sys/arch/hp300/stand/common/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.3 1998/05/10 11:31:19 downsj Exp $ */
+/* $OpenBSD: machdep.c,v 1.4 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: machdep.c,v 1.4 1997/06/28 07:20:25 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/nhpib.c b/sys/arch/hp300/stand/common/nhpib.c
index 2ab2fd52745..c8964a87aa6 100644
--- a/sys/arch/hp300/stand/common/nhpib.c
+++ b/sys/arch/hp300/stand/common/nhpib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nhpib.c,v 1.1 1997/07/14 08:14:26 downsj Exp $ */
+/* $OpenBSD: nhpib.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: nhpib.c,v 1.5 1995/08/05 16:47:46 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/prf.c b/sys/arch/hp300/stand/common/prf.c
index 14a41a35cd3..85c6f0312ec 100644
--- a/sys/arch/hp300/stand/common/prf.c
+++ b/sys/arch/hp300/stand/common/prf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prf.c,v 1.1 1997/07/14 08:14:27 downsj Exp $ */
+/* $OpenBSD: prf.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: prf.c,v 1.5 1994/10/26 07:27:50 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/scsi.c b/sys/arch/hp300/stand/common/scsi.c
index 66f9cac6428..85ee2268340 100644
--- a/sys/arch/hp300/stand/common/scsi.c
+++ b/sys/arch/hp300/stand/common/scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi.c,v 1.2 2002/04/29 06:26:50 pvalchev Exp $ */
+/* $OpenBSD: scsi.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: scsi.c,v 1.7 1997/01/30 10:32:57 thorpej Exp $ */
/*
@@ -24,11 +24,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/common/sd.c b/sys/arch/hp300/stand/common/sd.c
index 4c2a946bf30..fc78bb3c7fd 100644
--- a/sys/arch/hp300/stand/common/sd.c
+++ b/sys/arch/hp300/stand/common/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.2 1997/09/14 12:54:24 downsj Exp $ */
+/* $OpenBSD: sd.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: sd.c,v 1.9 1996/12/21 21:34:41 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/include/consdefs.h b/sys/arch/hp300/stand/include/consdefs.h
index 3dfcbf7af76..f4b7531c4b7 100644
--- a/sys/arch/hp300/stand/include/consdefs.h
+++ b/sys/arch/hp300/stand/include/consdefs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: consdefs.h,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: consdefs.h,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: consdefs.h,v 1.2 1997/05/12 07:45:41 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/include/device.h b/sys/arch/hp300/stand/include/device.h
index 5c25cf01907..f8f5ca3f7f0 100644
--- a/sys/arch/hp300/stand/include/device.h
+++ b/sys/arch/hp300/stand/include/device.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: device.h,v 1.1 1997/07/14 08:14:32 downsj Exp $ */
+/* $OpenBSD: device.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: device.h,v 1.1 1997/01/30 10:31:44 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/include/hpibvar.h b/sys/arch/hp300/stand/include/hpibvar.h
index da178c0bb4e..31678951490 100644
--- a/sys/arch/hp300/stand/include/hpibvar.h
+++ b/sys/arch/hp300/stand/include/hpibvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hpibvar.h,v 1.1 1997/07/14 08:14:33 downsj Exp $ */
+/* $OpenBSD: hpibvar.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: hpibvar.h,v 1.4 1994/10/26 07:27:24 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/include/if_lereg.h b/sys/arch/hp300/stand/include/if_lereg.h
index 701c8d707f4..d426c6a2e94 100644
--- a/sys/arch/hp300/stand/include/if_lereg.h
+++ b/sys/arch/hp300/stand/include/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.1 1997/07/14 08:14:34 downsj Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: if_lereg.h,v 1.1 1996/01/01 18:10:56 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/include/itevar.h b/sys/arch/hp300/stand/include/itevar.h
index 3d7cea77c1d..e0300db0eb1 100644
--- a/sys/arch/hp300/stand/include/itevar.h
+++ b/sys/arch/hp300/stand/include/itevar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: itevar.h,v 1.2 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: itevar.h,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: itevar.h,v 1.1 1996/03/03 04:23:42 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/include/rominfo.h b/sys/arch/hp300/stand/include/rominfo.h
index 21f1351ffa5..5e1673f2847 100644
--- a/sys/arch/hp300/stand/include/rominfo.h
+++ b/sys/arch/hp300/stand/include/rominfo.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rominfo.h,v 1.1 1997/07/14 08:14:37 downsj Exp $ */
+/* $OpenBSD: rominfo.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: rominfo.h,v 1.5 1994/10/26 07:27:53 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/include/samachdep.h b/sys/arch/hp300/stand/include/samachdep.h
index 5cb2b122494..0a87170a193 100644
--- a/sys/arch/hp300/stand/include/samachdep.h
+++ b/sys/arch/hp300/stand/include/samachdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: samachdep.h,v 1.3 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: samachdep.h,v 1.4 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: samachdep.h,v 1.3 1997/05/12 07:54:45 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/include/scsivar.h b/sys/arch/hp300/stand/include/scsivar.h
index bd479cc298c..67ad06bf8db 100644
--- a/sys/arch/hp300/stand/include/scsivar.h
+++ b/sys/arch/hp300/stand/include/scsivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsivar.h,v 1.1 1997/07/14 08:14:39 downsj Exp $ */
+/* $OpenBSD: scsivar.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: scsivar.h,v 1.4 1994/10/26 07:27:58 cgd Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/include/volhdr.h b/sys/arch/hp300/stand/include/volhdr.h
index 3f55ae44d0c..fe63d2ef938 100644
--- a/sys/arch/hp300/stand/include/volhdr.h
+++ b/sys/arch/hp300/stand/include/volhdr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: volhdr.h,v 1.1 1997/07/14 08:14:40 downsj Exp $ */
+/* $OpenBSD: volhdr.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: volhdr.h,v 1.4 1994/10/26 07:28:08 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/mkboot/mkboot.c b/sys/arch/hp300/stand/mkboot/mkboot.c
index 7d841da1619..52c051f6e2d 100644
--- a/sys/arch/hp300/stand/mkboot/mkboot.c
+++ b/sys/arch/hp300/stand/mkboot/mkboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkboot.c,v 1.2 1999/08/16 09:43:10 downsj Exp $ */
+/* $OpenBSD: mkboot.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -46,7 +42,7 @@ static char copyright[] =
static char sccsid[] = "@(#)mkboot.c 7.2 (Berkeley) 12/16/90";
static char rcsid[] = "$NetBSD: mkboot.c,v 1.5 1994/10/26 07:27:45 cgd Exp $";
#endif
-static char rcsid[] = "$OpenBSD: mkboot.c,v 1.2 1999/08/16 09:43:10 downsj Exp $";
+static char rcsid[] = "$OpenBSD: mkboot.c,v 1.3 2003/06/02 23:27:46 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/sys/arch/hp300/stand/uboot/clock.c b/sys/arch/hp300/stand/uboot/clock.c
index 6e1413eac22..29b6315197e 100644
--- a/sys/arch/hp300/stand/uboot/clock.c
+++ b/sys/arch/hp300/stand/uboot/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.2 2000/01/14 09:10:24 downsj Exp $ */
+/* $OpenBSD: clock.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: clock.c,v 1.3 1995/02/20 00:12:09 mycroft Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/uboot/conf.c b/sys/arch/hp300/stand/uboot/conf.c
index 88374a8eb1a..2b6c4dad0c7 100644
--- a/sys/arch/hp300/stand/uboot/conf.c
+++ b/sys/arch/hp300/stand/uboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.3 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: conf.c,v 1.4 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: conf.c,v 1.12 1996/10/14 07:29:15 thorpej Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/uboot/srt0.S b/sys/arch/hp300/stand/uboot/srt0.S
index 59f26baec9a..dfe5085cb34 100644
--- a/sys/arch/hp300/stand/uboot/srt0.S
+++ b/sys/arch/hp300/stand/uboot/srt0.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: srt0.S,v 1.3 1998/05/10 11:31:21 downsj Exp $ */
+/* $OpenBSD: srt0.S,v 1.4 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: srt0.S,v 1.4 1997/05/12 07:56:00 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/uboot/tgets.c b/sys/arch/hp300/stand/uboot/tgets.c
index 47efe066bde..b4135ce48c9 100644
--- a/sys/arch/hp300/stand/uboot/tgets.c
+++ b/sys/arch/hp300/stand/uboot/tgets.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tgets.c,v 1.1 1997/07/14 08:14:59 downsj Exp $ */
+/* $OpenBSD: tgets.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: tgets.c,v 1.4 1994/10/26 07:28:05 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hp300/stand/uboot/uboot.c b/sys/arch/hp300/stand/uboot/uboot.c
index efee8451e74..7c52d3a9455 100644
--- a/sys/arch/hp300/stand/uboot/uboot.c
+++ b/sys/arch/hp300/stand/uboot/uboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uboot.c,v 1.2 2003/04/03 17:01:29 millert Exp $ */
+/* $OpenBSD: uboot.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/* $NetBSD: uboot.c,v 1.3 1997/04/27 21:17:13 thorpej Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/gsc/gsckbd.c b/sys/arch/hppa/gsc/gsckbd.c
index eeca7697d33..5831e096871 100644
--- a/sys/arch/hppa/gsc/gsckbd.c
+++ b/sys/arch/hppa/gsc/gsckbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gsckbd.c,v 1.4 2003/02/16 02:08:04 miod Exp $ */
+/* $OpenBSD: gsckbd.c,v 1.5 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 2003, Miodrag Vallat.
* All rights reserved.
@@ -82,11 +82,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/hppa/autoconf.c b/sys/arch/hppa/hppa/autoconf.c
index 3c1c454585f..4e18f30d39f 100644
--- a/sys/arch/hppa/hppa/autoconf.c
+++ b/sys/arch/hppa/hppa/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.32 2003/05/11 19:41:09 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.33 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1998-2003 Michael Shalayeff
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 131a43f1337..3194c57608c 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.26 2003/05/14 00:20:37 tedu Exp $ */
+/* $OpenBSD: conf.c,v 1.27 2003/06/02 23:27:46 millert Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index 2229e0920f9..a4a2361c982 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.12 2003/02/18 19:01:50 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.13 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/hppa/genassym.cf b/sys/arch/hppa/hppa/genassym.cf
index 85708143445..a5e2383890e 100644
--- a/sys/arch/hppa/hppa/genassym.cf
+++ b/sys/arch/hppa/hppa/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.22 2002/09/20 18:59:57 mickey Exp $
+# $OpenBSD: genassym.cf,v 1.23 2003/06/02 23:27:46 millert Exp $
#
# Copyright (c) 1982, 1990, 1993
@@ -12,11 +12,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/hppa/hppa/sys_machdep.c b/sys/arch/hppa/hppa/sys_machdep.c
index 1a3160a868b..4e9b753141b 100644
--- a/sys/arch/hppa/hppa/sys_machdep.c
+++ b/sys/arch/hppa/hppa/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.2 2003/02/14 22:02:42 mickey Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/include/ansi.h b/sys/arch/hppa/include/ansi.h
index c6a19caa455..571f7db9c4a 100644
--- a/sys/arch/hppa/include/ansi.h
+++ b/sys/arch/hppa/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.4 2000/02/22 17:29:12 millert Exp $ */
+/* $OpenBSD: ansi.h,v 1.5 2003/06/02 23:27:46 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/include/float.h b/sys/arch/hppa/include/float.h
index e21cf03dbb1..2d024bb870c 100644
--- a/sys/arch/hppa/include/float.h
+++ b/sys/arch/hppa/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.4 2002/10/21 18:41:05 mickey Exp $ */
+/* $OpenBSD: float.h,v 1.5 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1989 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/include/hil_machdep.h b/sys/arch/hppa/include/hil_machdep.h
index 6ed974b7b55..3762b7f476a 100644
--- a/sys/arch/hppa/include/hil_machdep.h
+++ b/sys/arch/hppa/include/hil_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hil_machdep.h,v 1.1 2003/02/11 19:43:33 miod Exp $ */
+/* $OpenBSD: hil_machdep.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/include/ieee.h b/sys/arch/hppa/include/ieee.h
index 2b9a6b16c87..d908f10c698 100644
--- a/sys/arch/hppa/include/ieee.h
+++ b/sys/arch/hppa/include/ieee.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee.h,v 1.1 1999/04/20 19:44:04 mickey Exp $ */
+/* $OpenBSD: ieee.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/include/limits.h b/sys/arch/hppa/include/limits.h
index 61734179424..6d7257d2707 100644
--- a/sys/arch/hppa/include/limits.h
+++ b/sys/arch/hppa/include/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.7 2002/07/30 01:22:00 millert Exp $ */
+/* $OpenBSD: limits.h,v 1.8 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1992-1994, The University of Utah and
@@ -35,11 +35,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/include/proc.h b/sys/arch/hppa/include/proc.h
index 50192dc6da3..d05eb94fa6d 100644
--- a/sys/arch/hppa/include/proc.h
+++ b/sys/arch/hppa/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.1 1998/07/07 21:32:44 mickey Exp $ */
+/* $OpenBSD: proc.h,v 1.2 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/include/profile.h b/sys/arch/hppa/include/profile.h
index 9528c8505b7..c56a90dcc8b 100644
--- a/sys/arch/hppa/include/profile.h
+++ b/sys/arch/hppa/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.2 2003/01/30 05:38:34 mickey Exp $ */
+/* $OpenBSD: profile.h,v 1.3 2003/06/02 23:27:46 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/include/stdarg.h b/sys/arch/hppa/include/stdarg.h
index b9a05a08956..b2c8abba5b9 100644
--- a/sys/arch/hppa/include/stdarg.h
+++ b/sys/arch/hppa/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.3 2002/10/23 15:38:15 millert Exp $ */
+/* $OpenBSD: stdarg.h,v 1.4 2003/06/02 23:27:46 millert Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/include/types.h b/sys/arch/hppa/include/types.h
index 6c35e4e76a8..708d4d64703 100644
--- a/sys/arch/hppa/include/types.h
+++ b/sys/arch/hppa/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.8 2003/02/15 00:52:28 miod Exp $ */
+/* $OpenBSD: types.h,v 1.9 2003/06/02 23:27:46 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/hppa/stand/mkboot/mkboot.8 b/sys/arch/hppa/stand/mkboot/mkboot.8
index 21574f2dd27..6129d8bb4ac 100644
--- a/sys/arch/hppa/stand/mkboot/mkboot.8
+++ b/sys/arch/hppa/stand/mkboot/mkboot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mkboot.8,v 1.6 2003/04/07 16:20:38 mickey Exp $
+.\" $OpenBSD: mkboot.8,v 1.7 2003/06/02 23:27:47 millert Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/sys/arch/hppa/stand/mkboot/mkboot.c b/sys/arch/hppa/stand/mkboot/mkboot.c
index b82b543c7f9..d8c5fdb5f3a 100644
--- a/sys/arch/hppa/stand/mkboot/mkboot.c
+++ b/sys/arch/hppa/stand/mkboot/mkboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkboot.c,v 1.12 2003/05/11 19:41:09 deraadt Exp $ */
+/* $OpenBSD: mkboot.c,v 1.13 2003/06/02 23:27:47 millert Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ static char copyright[] =
#endif /* not lint */
#ifndef lint
-static char rcsid[] = "$OpenBSD: mkboot.c,v 1.12 2003/05/11 19:41:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkboot.c,v 1.13 2003/06/02 23:27:47 millert Exp $";
#endif /* not lint */
#endif
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index f8b7b94b095..a0bcd3c71f8 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.46 2003/03/14 22:05:43 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.47 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index cf51d7435a4..d2975db4d90 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.42 2002/03/14 01:26:32 millert Exp $ */
+/* $OpenBSD: disksubr.c,v 1.43 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/dkbad.c b/sys/arch/i386/i386/dkbad.c
index 6f39d0f17ba..030f681466e 100644
--- a/sys/arch/i386/i386/dkbad.c
+++ b/sys/arch/i386/i386/dkbad.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dkbad.c,v 1.5 2001/07/04 08:57:46 niklas Exp $ */
+/* $OpenBSD: dkbad.c,v 1.6 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: dkbad.c,v 1.4 1996/02/02 18:05:59 mycroft Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/freebsd_machdep.c b/sys/arch/i386/i386/freebsd_machdep.c
index 0923b38ee98..ef9930565a6 100644
--- a/sys/arch/i386/i386/freebsd_machdep.c
+++ b/sys/arch/i386/i386/freebsd_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: freebsd_machdep.c,v 1.16 2003/05/13 03:49:04 art Exp $ */
+/* $OpenBSD: freebsd_machdep.c,v 1.17 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: freebsd_machdep.c,v 1.10 1996/05/03 19:42:05 christos Exp $ */
/*-
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/genassym.cf b/sys/arch/i386/i386/genassym.cf
index 828df6bb8c1..e74f22cae5f 100644
--- a/sys/arch/i386/i386/genassym.cf
+++ b/sys/arch/i386/i386/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.12 2001/12/01 13:07:24 ho Exp $
+# $OpenBSD: genassym.cf,v 1.13 2003/06/02 23:27:47 millert Exp $
#
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -11,11 +11,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/i386/i386/ipx_cksum.c b/sys/arch/i386/i386/ipx_cksum.c
index 04ad3a215b8..981da5ff6df 100644
--- a/sys/arch/i386/i386/ipx_cksum.c
+++ b/sys/arch/i386/i386/ipx_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipx_cksum.c,v 1.2 1996/10/18 15:25:25 mickey Exp $ */
+/* $OpenBSD: ipx_cksum.c,v 1.3 2003/06/02 23:27:47 millert Exp $ */
/*-
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index aedc30dc354..f07a902e600 100644
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.s,v 1.69 2003/04/17 03:42:14 drahn Exp $ */
+/* $OpenBSD: locore.s,v 1.70 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 0416b7bf7cf..5c727ae44f5 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.234 2003/06/02 18:14:16 jason Exp $ */
+/* $OpenBSD: machdep.c,v 1.235 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -55,11 +55,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index 98bf572d0b7..f24eac1c19b 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,5 +1,5 @@
/* $NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $ */
-/* $OpenBSD: mem.c,v 1.25 2003/02/26 18:25:29 tedu Exp $ */
+/* $OpenBSD: mem.c,v 1.26 2003/06/02 23:27:47 millert Exp $ */
/*
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1986, 1990, 1993
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/ns_cksum.c b/sys/arch/i386/i386/ns_cksum.c
index 5016c0f411a..c5fb8caba3a 100644
--- a/sys/arch/i386/i386/ns_cksum.c
+++ b/sys/arch/i386/i386/ns_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns_cksum.c,v 1.5 2001/09/20 17:02:30 mpech Exp $ */
+/* $OpenBSD: ns_cksum.c,v 1.6 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: ns_cksum.c,v 1.5 1996/05/03 19:42:20 christos Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/process_machdep.c b/sys/arch/i386/i386/process_machdep.c
index c4148f27494..79735829391 100644
--- a/sys/arch/i386/i386/process_machdep.c
+++ b/sys/arch/i386/i386/process_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process_machdep.c,v 1.10 2002/03/14 01:26:33 millert Exp $ */
+/* $OpenBSD: process_machdep.c,v 1.11 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: process_machdep.c,v 1.22 1996/05/03 19:42:25 christos Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c
index dc6f71f384a..e4afb9e9068 100644
--- a/sys/arch/i386/i386/sys_machdep.c
+++ b/sys/arch/i386/i386/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.20 2003/03/28 00:49:13 miod Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.21 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: sys_machdep.c,v 1.28 1996/05/03 19:42:29 christos Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index fb730187ae7..e0ed74e9708 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.57 2003/05/13 03:49:04 art Exp $ */
+/* $OpenBSD: trap.c,v 1.58 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index e77093d2039..20cda037a0b 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.38 2003/01/16 04:15:17 art Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.39 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $ */
/*-
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/ansi.h b/sys/arch/i386/include/ansi.h
index 77007789441..e8d2306844f 100644
--- a/sys/arch/i386/include/ansi.h
+++ b/sys/arch/i386/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.7 2000/02/22 17:29:13 millert Exp $ */
+/* $OpenBSD: ansi.h,v 1.8 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: ansi.h,v 1.7 1996/11/15 22:38:50 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/asm.h b/sys/arch/i386/include/asm.h
index 46832bff302..2126271a519 100644
--- a/sys/arch/i386/include/asm.h
+++ b/sys/arch/i386/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.6 2003/04/17 03:42:14 drahn Exp $ */
+/* $OpenBSD: asm.h,v 1.7 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: asm.h,v 1.7 1994/10/27 04:15:56 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index fa22463d0b3..35fe59fe135 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.48 2003/05/27 23:52:01 fgsch Exp $ */
+/* $OpenBSD: cpu.h,v 1.49 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/float.h b/sys/arch/i386/include/float.h
index 50a2c3b1db8..a503a4836b9 100644
--- a/sys/arch/i386/include/float.h
+++ b/sys/arch/i386/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.4 2002/03/14 01:26:33 millert Exp $ */
+/* $OpenBSD: float.h,v 1.5 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/frame.h b/sys/arch/i386/include/frame.h
index 6954285a5a0..5c408bc0a27 100644
--- a/sys/arch/i386/include/frame.h
+++ b/sys/arch/i386/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.4 2000/08/05 22:07:31 niklas Exp $ */
+/* $OpenBSD: frame.h,v 1.5 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: frame.h,v 1.12 1995/10/11 04:20:08 mycroft Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/freebsd_machdep.h b/sys/arch/i386/include/freebsd_machdep.h
index c18e5d9dc7e..4ce829bf616 100644
--- a/sys/arch/i386/include/freebsd_machdep.h
+++ b/sys/arch/i386/include/freebsd_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: freebsd_machdep.h,v 1.6 2002/03/14 01:26:33 millert Exp $ */
+/* $OpenBSD: freebsd_machdep.h,v 1.7 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: freebsd_machdep.h,v 1.1 1995/10/10 01:22:35 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/ieee.h b/sys/arch/i386/include/ieee.h
index f0000fb3cf4..55b3703277c 100644
--- a/sys/arch/i386/include/ieee.h
+++ b/sys/arch/i386/include/ieee.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee.h,v 1.1 2001/09/06 00:07:09 millert Exp $ */
+/* $OpenBSD: ieee.h,v 1.2 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: ieee.h,v 1.1 1996/09/30 16:34:25 ws Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/limits.h b/sys/arch/i386/include/limits.h
index c8e5de39ec1..ba28ec5d05d 100644
--- a/sys/arch/i386/include/limits.h
+++ b/sys/arch/i386/include/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.8 2002/07/30 01:22:00 millert Exp $ */
+/* $OpenBSD: limits.h,v 1.9 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: limits.h,v 1.11 1995/12/21 01:08:59 mycroft Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/npx.h b/sys/arch/i386/include/npx.h
index 00877f89f2a..c9fab4ffe9b 100644
--- a/sys/arch/i386/include/npx.h
+++ b/sys/arch/i386/include/npx.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: npx.h,v 1.4 2000/08/05 22:07:32 niklas Exp $ */
+/* $OpenBSD: npx.h,v 1.5 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: npx.h,v 1.11 1994/10/27 04:16:11 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h
index 9fd2eede37e..0406774c0a5 100644
--- a/sys/arch/i386/include/param.h
+++ b/sys/arch/i386/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.23 2003/04/17 03:42:14 drahn Exp $ */
+/* $OpenBSD: param.h,v 1.24 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/pcb.h b/sys/arch/i386/include/pcb.h
index 889bdc95397..a3224657358 100644
--- a/sys/arch/i386/include/pcb.h
+++ b/sys/arch/i386/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.8 2003/05/02 21:07:50 mickey Exp $ */
+/* $OpenBSD: pcb.h,v 1.9 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: pcb.h,v 1.21 1996/01/08 13:51:42 mycroft Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/proc.h b/sys/arch/i386/include/proc.h
index 7c4ac317de1..ff0bc4b1bb3 100644
--- a/sys/arch/i386/include/proc.h
+++ b/sys/arch/i386/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.2 2000/08/05 22:07:32 niklas Exp $ */
+/* $OpenBSD: proc.h,v 1.3 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: proc.h,v 1.10 1995/08/06 05:33:23 mycroft Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/profile.h b/sys/arch/i386/include/profile.h
index 56723c1889a..55fa3628456 100644
--- a/sys/arch/i386/include/profile.h
+++ b/sys/arch/i386/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.7 2002/03/14 01:26:33 millert Exp $ */
+/* $OpenBSD: profile.h,v 1.8 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: profile.h,v 1.6 1995/03/28 18:17:08 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h
index f9dcb72032d..6d46152398d 100644
--- a/sys/arch/i386/include/psl.h
+++ b/sys/arch/i386/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.12 2002/03/14 01:26:33 millert Exp $ */
+/* $OpenBSD: psl.h,v 1.13 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: psl.h,v 1.30 1996/05/13 01:28:05 mycroft Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/reg.h b/sys/arch/i386/include/reg.h
index 327027ac329..98ccb89f509 100644
--- a/sys/arch/i386/include/reg.h
+++ b/sys/arch/i386/include/reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reg.h,v 1.2 2000/08/05 22:07:32 niklas Exp $ */
+/* $OpenBSD: reg.h,v 1.3 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: reg.h,v 1.14 1995/10/11 04:20:24 mycroft Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/segments.h b/sys/arch/i386/include/segments.h
index c98a7fdbf9b..b7863d819e4 100644
--- a/sys/arch/i386/include/segments.h
+++ b/sys/arch/i386/include/segments.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: segments.h,v 1.10 2002/07/31 02:30:29 mickey Exp $ */
+/* $OpenBSD: segments.h,v 1.11 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: segments.h,v 1.23 1996/02/01 22:31:03 mycroft Exp $ */
/*-
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/signal.h b/sys/arch/i386/include/signal.h
index 231099d21ae..e76b5574f07 100644
--- a/sys/arch/i386/include/signal.h
+++ b/sys/arch/i386/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.3 2000/08/05 22:07:32 niklas Exp $ */
+/* $OpenBSD: signal.h,v 1.4 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: signal.h,v 1.6 1996/01/08 13:51:43 mycroft Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/specialreg.h b/sys/arch/i386/include/specialreg.h
index a03e77360ef..2044eb1d5f2 100644
--- a/sys/arch/i386/include/specialreg.h
+++ b/sys/arch/i386/include/specialreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: specialreg.h,v 1.12 2003/03/14 22:05:45 deraadt Exp $ */
+/* $OpenBSD: specialreg.h,v 1.13 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: specialreg.h,v 1.7 1994/10/27 04:16:26 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/stdarg.h b/sys/arch/i386/include/stdarg.h
index fa2df68e726..4c51b5768bd 100644
--- a/sys/arch/i386/include/stdarg.h
+++ b/sys/arch/i386/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.5 2002/10/23 15:38:15 millert Exp $ */
+/* $OpenBSD: stdarg.h,v 1.6 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: stdarg.h,v 1.12 1995/12/25 23:15:31 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/trap.h b/sys/arch/i386/include/trap.h
index 921090327c3..51346cfbecd 100644
--- a/sys/arch/i386/include/trap.h
+++ b/sys/arch/i386/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.3 2000/08/05 22:07:33 niklas Exp $ */
+/* $OpenBSD: trap.h,v 1.4 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: trap.h,v 1.4 1994/10/27 04:16:30 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/tss.h b/sys/arch/i386/include/tss.h
index 5d47b1160f7..20f6f38f7d5 100644
--- a/sys/arch/i386/include/tss.h
+++ b/sys/arch/i386/include/tss.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tss.h,v 1.5 2003/05/02 21:07:50 mickey Exp $ */
+/* $OpenBSD: tss.h,v 1.6 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: tss.h,v 1.6 1995/10/11 04:20:28 mycroft Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/types.h b/sys/arch/i386/include/types.h
index b9aa57b1501..0da0bdc06e2 100644
--- a/sys/arch/i386/include/types.h
+++ b/sys/arch/i386/include/types.h
@@ -1,5 +1,5 @@
/* $NetBSD: types.h,v 1.12 1995/12/24 01:08:03 mycroft Exp $ */
-/* $OpenBSD: types.h,v 1.12 2003/01/21 00:46:46 art Exp $ */
+/* $OpenBSD: types.h,v 1.13 2003/06/02 23:27:47 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/varargs.h b/sys/arch/i386/include/varargs.h
index 864b6955157..58f14545a9c 100644
--- a/sys/arch/i386/include/varargs.h
+++ b/sys/arch/i386/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.4 2000/08/05 22:07:33 niklas Exp $ */
+/* $OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: varargs.h,v 1.14 1995/12/26 01:16:26 mycroft Exp $ */
/*-
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/include/vmparam.h b/sys/arch/i386/include/vmparam.h
index 2769e45efea..e1c4498cb4d 100644
--- a/sys/arch/i386/include/vmparam.h
+++ b/sys/arch/i386/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.27 2003/05/05 17:54:59 drahn Exp $ */
+/* $OpenBSD: vmparam.h,v 1.28 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: vmparam.h,v 1.15 1994/10/27 04:16:34 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index 52bfc4c82c7..aff710f4a78 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.29 2003/05/27 23:52:01 fgsch Exp $ */
+/* $OpenBSD: clock.c,v 1.30 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/isa/icu.h b/sys/arch/i386/isa/icu.h
index 5279822d3cd..9b68025526b 100644
--- a/sys/arch/i386/isa/icu.h
+++ b/sys/arch/i386/isa/icu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: icu.h,v 1.7 2001/12/04 00:00:36 niklas Exp $ */
+/* $OpenBSD: icu.h,v 1.8 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: icu.h,v 1.19 1996/02/01 22:31:21 mycroft Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index 949ab3171e5..0a8b580c6f4 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.47 2003/01/16 04:17:10 art Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.48 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */
#define ISA_DMA_STATS
@@ -94,11 +94,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index db7b99d6762..6c502120dd0 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.18 2003/01/16 04:17:10 art Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.19 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $ */
/*-
@@ -53,11 +53,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index 6b66cb3bc31..3d5e0ae6f03 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: npx.c,v 1.26 2003/04/17 03:42:14 drahn Exp $ */
+/* $OpenBSD: npx.c,v 1.27 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: npx.c,v 1.57 1996/05/12 23:12:24 mycroft Exp $ */
#if 0
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/isa/nvram.h b/sys/arch/i386/isa/nvram.h
index d28cab74588..ea74b71af75 100644
--- a/sys/arch/i386/isa/nvram.h
+++ b/sys/arch/i386/isa/nvram.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nvram.h,v 1.5 1999/01/13 07:26:01 niklas Exp $ */
+/* $OpenBSD: nvram.h,v 1.6 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: nvram.h,v 1.5 1995/05/05 22:08:43 mycroft Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c
index 79b848d80dd..88c1e849872 100644
--- a/sys/arch/i386/isa/pccom.c
+++ b/sys/arch/i386/isa/pccom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccom.c,v 1.42 2002/03/14 01:26:33 millert Exp $ */
+/* $OpenBSD: pccom.c,v 1.43 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
@@ -42,11 +42,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/isa/timerreg.h b/sys/arch/i386/isa/timerreg.h
index 546d75782d4..7b69e66884e 100644
--- a/sys/arch/i386/isa/timerreg.h
+++ b/sys/arch/i386/isa/timerreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: timerreg.h,v 1.2 1999/01/13 07:26:01 niklas Exp $ */
+/* $OpenBSD: timerreg.h,v 1.3 2003/06/02 23:27:47 millert Exp $ */
/* $NetBSD: timerreg.h,v 1.4 1994/10/27 04:18:17 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/i386/stand/libsa/alloca.S b/sys/arch/i386/stand/libsa/alloca.S
index ac663e5cd1c..e8a383ca7bb 100644
--- a/sys/arch/i386/stand/libsa/alloca.S
+++ b/sys/arch/i386/stand/libsa/alloca.S
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if defined(LIBC_SCCS)
.text
- .asciz "$OpenBSD: alloca.S,v 1.3 2003/04/17 03:43:18 drahn Exp $"
+ .asciz "$OpenBSD: alloca.S,v 1.4 2003/06/02 23:27:47 millert Exp $"
#endif
/* like alloc, but automatic free in return */
diff --git a/sys/arch/m68k/fpe/fpu_add.c b/sys/arch/m68k/fpe/fpu_add.c
index 33c6df85c2e..c6a4931dbf5 100644
--- a/sys/arch/m68k/fpe/fpu_add.c
+++ b/sys/arch/m68k/fpe/fpu_add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_add.c,v 1.2 1996/05/09 22:20:42 niklas Exp $ */
+/* $OpenBSD: fpu_add.c,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: fpu_add.c,v 1.2 1996/04/30 11:52:09 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/fpe/fpu_arith.h b/sys/arch/m68k/fpe/fpu_arith.h
index 4a444a7c673..c42edc55195 100644
--- a/sys/arch/m68k/fpe/fpu_arith.h
+++ b/sys/arch/m68k/fpe/fpu_arith.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_arith.h,v 1.2 1996/05/29 21:05:14 niklas Exp $ */
+/* $OpenBSD: fpu_arith.h,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: fpu_arith.h,v 1.1 1995/11/03 04:46:59 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/fpe/fpu_div.c b/sys/arch/m68k/fpe/fpu_div.c
index 2e7e81f44c1..f7cfa83b50c 100644
--- a/sys/arch/m68k/fpe/fpu_div.c
+++ b/sys/arch/m68k/fpe/fpu_div.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_div.c,v 1.2 1996/05/29 21:05:15 niklas Exp $ */
+/* $OpenBSD: fpu_div.c,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: fpu_div.c,v 1.1 1995/11/03 04:47:02 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/fpe/fpu_explode.c b/sys/arch/m68k/fpe/fpu_explode.c
index 74d92f3147b..d6227e33189 100644
--- a/sys/arch/m68k/fpe/fpu_explode.c
+++ b/sys/arch/m68k/fpe/fpu_explode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_explode.c,v 1.3 2002/03/14 01:26:34 millert Exp $ */
+/* $OpenBSD: fpu_explode.c,v 1.4 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: fpu_explode.c,v 1.2 1996/04/30 11:52:18 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/fpe/fpu_implode.c b/sys/arch/m68k/fpe/fpu_implode.c
index f6aca71e792..8fd904d4453 100644
--- a/sys/arch/m68k/fpe/fpu_implode.c
+++ b/sys/arch/m68k/fpe/fpu_implode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_implode.c,v 1.3 2002/03/14 01:26:34 millert Exp $ */
+/* $OpenBSD: fpu_implode.c,v 1.4 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: fpu_implode.c,v 1.2 1996/04/30 11:52:30 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/fpe/fpu_mul.c b/sys/arch/m68k/fpe/fpu_mul.c
index 3e3f1edf199..eac1d4c3920 100644
--- a/sys/arch/m68k/fpe/fpu_mul.c
+++ b/sys/arch/m68k/fpe/fpu_mul.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_mul.c,v 1.2 1996/05/29 21:05:17 niklas Exp $ */
+/* $OpenBSD: fpu_mul.c,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: fpu_mul.c,v 1.1 1995/11/03 04:47:16 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/fpe/fpu_sqrt.c b/sys/arch/m68k/fpe/fpu_sqrt.c
index 80a09f5c2ec..a4e86995fa3 100644
--- a/sys/arch/m68k/fpe/fpu_sqrt.c
+++ b/sys/arch/m68k/fpe/fpu_sqrt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_sqrt.c,v 1.2 1996/05/30 22:28:09 niklas Exp $ */
+/* $OpenBSD: fpu_sqrt.c,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: fpu_sqrt.c,v 1.1 1995/11/03 04:47:18 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/fpe/fpu_subr.c b/sys/arch/m68k/fpe/fpu_subr.c
index 0f62d770d9d..595a1631e82 100644
--- a/sys/arch/m68k/fpe/fpu_subr.c
+++ b/sys/arch/m68k/fpe/fpu_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_subr.c,v 1.2 1996/05/09 22:20:48 niklas Exp $ */
+/* $OpenBSD: fpu_subr.c,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: fpu_subr.c,v 1.2 1996/04/30 11:52:38 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/fpe/ieee.h b/sys/arch/m68k/fpe/ieee.h
index c086c036c5a..2d8609a3b4d 100644
--- a/sys/arch/m68k/fpe/ieee.h
+++ b/sys/arch/m68k/fpe/ieee.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee.h,v 1.2 1996/05/29 21:05:17 niklas Exp $ */
+/* $OpenBSD: ieee.h,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: ieee.h,v 1.1 1995/11/03 04:47:21 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/ansi.h b/sys/arch/m68k/include/ansi.h
index 53c6af36a97..3f2ab4068c2 100644
--- a/sys/arch/m68k/include/ansi.h
+++ b/sys/arch/m68k/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.6 2000/02/22 17:29:13 millert Exp $ */
+/* $OpenBSD: ansi.h,v 1.7 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: ansi.h,v 1.7 1996/11/15 22:38:52 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/cpu.h b/sys/arch/m68k/include/cpu.h
index e14c58d30fa..eca8317f6d2 100644
--- a/sys/arch/m68k/include/cpu.h
+++ b/sys/arch/m68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.9 2003/01/09 22:27:09 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.10 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: cpu.h,v 1.3 1997/02/02 06:56:57 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/float.h b/sys/arch/m68k/include/float.h
index 984a9adee24..114cb739c79 100644
--- a/sys/arch/m68k/include/float.h
+++ b/sys/arch/m68k/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.4 2002/03/14 01:26:34 millert Exp $ */
+/* $OpenBSD: float.h,v 1.5 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: float.h,v 1.10 1995/06/20 20:45:41 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/frame.h b/sys/arch/m68k/include/frame.h
index 26570d4a717..185d606e513 100644
--- a/sys/arch/m68k/include/frame.h
+++ b/sys/arch/m68k/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.6 2000/12/06 17:19:00 deraadt Exp $ */
+/* $OpenBSD: frame.h,v 1.7 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: frame.h,v 1.15 1997/05/03 12:49:05 mycroft Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/ieee.h b/sys/arch/m68k/include/ieee.h
index 347d7a569b9..ed0cbb84147 100644
--- a/sys/arch/m68k/include/ieee.h
+++ b/sys/arch/m68k/include/ieee.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee.h,v 1.1 2001/09/06 00:07:10 millert Exp $ */
+/* $OpenBSD: ieee.h,v 1.2 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: ieee.h,v 1.2 1994/11/20 20:53:10 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/limits.h b/sys/arch/m68k/include/limits.h
index 2a32e7870a7..e269db30f40 100644
--- a/sys/arch/m68k/include/limits.h
+++ b/sys/arch/m68k/include/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.6 2002/07/30 01:22:00 millert Exp $ */
+/* $OpenBSD: limits.h,v 1.7 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: limits.h,v 1.9 1994/10/26 07:50:48 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/param.h b/sys/arch/m68k/include/param.h
index 8f5bb029b88..37acac47b79 100644
--- a/sys/arch/m68k/include/param.h
+++ b/sys/arch/m68k/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.7 2002/01/10 21:08:41 miod Exp $ */
+/* $OpenBSD: param.h,v 1.8 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: param.h,v 1.2 1997/06/10 18:21:23 veego Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/pmap_motorola.h b/sys/arch/m68k/include/pmap_motorola.h
index c306913b74b..8caf59a8a0e 100644
--- a/sys/arch/m68k/include/pmap_motorola.h
+++ b/sys/arch/m68k/include/pmap_motorola.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_motorola.h,v 1.8 2003/03/01 00:28:45 miod Exp $ */
+/* $OpenBSD: pmap_motorola.h,v 1.9 2003/06/02 23:27:48 millert Exp $ */
/*
* Copyright (c) 1987 Carnegie-Mellon University
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/profile.h b/sys/arch/m68k/include/profile.h
index 2a17085ec6e..f81db56eb9f 100644
--- a/sys/arch/m68k/include/profile.h
+++ b/sys/arch/m68k/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.5 2002/03/14 01:26:34 millert Exp $ */
+/* $OpenBSD: profile.h,v 1.6 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: profile.h,v 1.3 1995/03/26 17:08:37 briggs Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/psl.h b/sys/arch/m68k/include/psl.h
index e234296bc93..8e0823dfe9d 100644
--- a/sys/arch/m68k/include/psl.h
+++ b/sys/arch/m68k/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.3 2003/01/05 01:51:25 miod Exp $ */
+/* $OpenBSD: psl.h,v 1.4 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: psl.h,v 1.5 1994/10/26 07:50:50 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/pte_motorola.h b/sys/arch/m68k/include/pte_motorola.h
index d9a24186067..dcf9f5a490d 100644
--- a/sys/arch/m68k/include/pte_motorola.h
+++ b/sys/arch/m68k/include/pte_motorola.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pte_motorola.h,v 1.3 2002/01/10 21:08:41 miod Exp $ */
+/* $OpenBSD: pte_motorola.h,v 1.4 2003/06/02 23:27:48 millert Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/reg.h b/sys/arch/m68k/include/reg.h
index 7041b4c1bf4..60f9779b7e1 100644
--- a/sys/arch/m68k/include/reg.h
+++ b/sys/arch/m68k/include/reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reg.h,v 1.5 2003/05/31 13:39:48 miod Exp $ */
+/* $OpenBSD: reg.h,v 1.6 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: reg.h,v 1.12 1996/12/17 19:24:31 gwr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/signal.h b/sys/arch/m68k/include/signal.h
index 18abdd17219..158efa5af5d 100644
--- a/sys/arch/m68k/include/signal.h
+++ b/sys/arch/m68k/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.2 1996/05/29 18:38:37 niklas Exp $ */
+/* $OpenBSD: signal.h,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: signal.h,v 1.4 1995/01/10 19:01:31 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/stdarg.h b/sys/arch/m68k/include/stdarg.h
index 03072675a0f..2ce90b1d71c 100644
--- a/sys/arch/m68k/include/stdarg.h
+++ b/sys/arch/m68k/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.5 2002/10/23 15:38:15 millert Exp $ */
+/* $OpenBSD: stdarg.h,v 1.6 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: stdarg.h,v 1.14 1995/12/25 23:15:33 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/trap.h b/sys/arch/m68k/include/trap.h
index 0a7b2a29430..14380f5f0ca 100644
--- a/sys/arch/m68k/include/trap.h
+++ b/sys/arch/m68k/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.2 1996/05/29 18:38:40 niklas Exp $ */
+/* $OpenBSD: trap.h,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: trap.h,v 1.8 1994/10/26 07:50:56 cgd Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/types.h b/sys/arch/m68k/include/types.h
index ba143790147..bbbbc8a25f3 100644
--- a/sys/arch/m68k/include/types.h
+++ b/sys/arch/m68k/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.9 2001/08/11 01:58:34 art Exp $ */
+/* $OpenBSD: types.h,v 1.10 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: types.h,v 1.9 1995/07/06 03:39:38 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/varargs.h b/sys/arch/m68k/include/varargs.h
index 0e5c9c3aed4..95cbae0ae75 100644
--- a/sys/arch/m68k/include/varargs.h
+++ b/sys/arch/m68k/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.4 1996/05/29 18:38:41 niklas Exp $ */
+/* $OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: varargs.h,v 1.14 1995/12/26 01:16:28 mycroft Exp $ */
/*-
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/include/vmparam.h b/sys/arch/m68k/include/vmparam.h
index 698854e6c72..8b36ee9bb16 100644
--- a/sys/arch/m68k/include/vmparam.h
+++ b/sys/arch/m68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.1 2003/01/27 19:37:30 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.2 2003/06/02 23:27:48 millert Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/bcopy.s b/sys/arch/m68k/m68k/bcopy.s
index a64cba9c50e..596dfbe4494 100644
--- a/sys/arch/m68k/m68k/bcopy.s
+++ b/sys/arch/m68k/m68k/bcopy.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcopy.s,v 1.1 1997/03/26 08:23:53 downsj Exp $ */
+/* $OpenBSD: bcopy.s,v 1.2 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: bcopy.s,v 1.1 1997/03/17 19:44:33 gwr Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/copy.s b/sys/arch/m68k/m68k/copy.s
index a1a70aba52c..fc8097f070c 100644
--- a/sys/arch/m68k/m68k/copy.s
+++ b/sys/arch/m68k/m68k/copy.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: copy.s,v 1.14 2003/01/09 22:27:09 miod Exp $ */
+/* $OpenBSD: copy.s,v 1.15 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: copy.s,v 1.30 1998/03/04 06:39:14 thorpej Exp $ */
/*-
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/genassym.cf b/sys/arch/m68k/m68k/genassym.cf
index 6c0aa12b4a3..98321e70e90 100644
--- a/sys/arch/m68k/m68k/genassym.cf
+++ b/sys/arch/m68k/m68k/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.9 2003/06/02 07:06:56 deraadt Exp $
+# $OpenBSD: genassym.cf,v 1.10 2003/06/02 23:27:48 millert Exp $
#
# Copyright (c) 1995 Theo de Raadt
@@ -35,11 +35,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/m68k/m68k/in_cksum.c b/sys/arch/m68k/m68k/in_cksum.c
index 45fe512079f..32863926116 100644
--- a/sys/arch/m68k/m68k/in_cksum.c
+++ b/sys/arch/m68k/m68k/in_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_cksum.c,v 1.3 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: in_cksum.c,v 1.4 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: in_cksum.c,v 1.6 1996/04/30 11:57:05 briggs Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/kgdb_m68k.c b/sys/arch/m68k/m68k/kgdb_m68k.c
index 9862bafe783..eea13227548 100644
--- a/sys/arch/m68k/m68k/kgdb_m68k.c
+++ b/sys/arch/m68k/m68k/kgdb_m68k.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kgdb_m68k.c,v 1.1 1997/03/21 00:36:41 niklas Exp $ */
+/* $OpenBSD: kgdb_m68k.c,v 1.2 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: kgdb_m68k.c,v 1.1 1997/02/12 00:58:01 gwr Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/mappedcopy.c b/sys/arch/m68k/m68k/mappedcopy.c
index b10e347d167..6fa9a966a02 100644
--- a/sys/arch/m68k/m68k/mappedcopy.c
+++ b/sys/arch/m68k/m68k/mappedcopy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mappedcopy.c,v 1.10 2003/01/09 22:27:09 miod Exp $ */
+/* $OpenBSD: mappedcopy.c,v 1.11 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: mappedcopy.c,v 1.1 1997/02/02 06:54:10 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/ns_cksum.c b/sys/arch/m68k/m68k/ns_cksum.c
index 180d184142d..7ef9d75502b 100644
--- a/sys/arch/m68k/m68k/ns_cksum.c
+++ b/sys/arch/m68k/m68k/ns_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns_cksum.c,v 1.3 2001/09/20 17:02:30 mpech Exp $ */
+/* $OpenBSD: ns_cksum.c,v 1.4 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: ns_cksum.c,v 1.5 1996/04/01 01:38:15 briggs Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/pmap_bootstrap.c b/sys/arch/m68k/m68k/pmap_bootstrap.c
index 8e1645bc132..e5197538949 100644
--- a/sys/arch/m68k/m68k/pmap_bootstrap.c
+++ b/sys/arch/m68k/m68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.5 2003/06/02 07:06:56 deraadt Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.6 2003/06/02 23:27:48 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -40,11 +40,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/pmap_motorola.c b/sys/arch/m68k/m68k/pmap_motorola.c
index d5f5570dbc7..6304deb13d8 100644
--- a/sys/arch/m68k/m68k/pmap_motorola.c
+++ b/sys/arch/m68k/m68k/pmap_motorola.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_motorola.c,v 1.26 2003/06/02 07:06:56 deraadt Exp $ */
+/* $OpenBSD: pmap_motorola.c,v 1.27 2003/06/02 23:27:48 millert Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -77,11 +77,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/proc_subr.s b/sys/arch/m68k/m68k/proc_subr.s
index 254b453dbe7..23d3f4d61b8 100644
--- a/sys/arch/m68k/m68k/proc_subr.s
+++ b/sys/arch/m68k/m68k/proc_subr.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc_subr.s,v 1.1 1997/07/06 07:46:28 downsj Exp $ */
+/* $OpenBSD: proc_subr.s,v 1.2 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: proc_subr.s,v 1.2 1997/04/25 02:22:01 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/regdump.c b/sys/arch/m68k/m68k/regdump.c
index ebb4187e9c1..880c8f7bcab 100644
--- a/sys/arch/m68k/m68k/regdump.c
+++ b/sys/arch/m68k/m68k/regdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: regdump.c,v 1.4 2003/01/09 22:27:09 miod Exp $ */
+/* $OpenBSD: regdump.c,v 1.5 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: regdump.c,v 1.1 1997/04/09 19:21:47 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/sig_machdep.c b/sys/arch/m68k/m68k/sig_machdep.c
index 8bd5664ea3e..6943878e3c7 100644
--- a/sys/arch/m68k/m68k/sig_machdep.c
+++ b/sys/arch/m68k/m68k/sig_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sig_machdep.c,v 1.12 2003/06/02 07:06:56 deraadt Exp $ */
+/* $OpenBSD: sig_machdep.c,v 1.13 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: sig_machdep.c,v 1.3 1997/04/30 23:28:03 gwr Exp $ */
/*
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/sigcode.s b/sys/arch/m68k/m68k/sigcode.s
index 3ca672e4501..ad3c276b279 100644
--- a/sys/arch/m68k/m68k/sigcode.s
+++ b/sys/arch/m68k/m68k/sigcode.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigcode.s,v 1.2 2001/12/06 23:24:59 miod Exp $ */
+/* $OpenBSD: sigcode.s,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: sigcode.s,v 1.2 1997/04/25 02:22:03 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/sigreturn.s b/sys/arch/m68k/m68k/sigreturn.s
index cb8ac5cc65b..781178d1172 100644
--- a/sys/arch/m68k/m68k/sigreturn.s
+++ b/sys/arch/m68k/m68k/sigreturn.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigreturn.s,v 1.2 1997/07/06 07:46:30 downsj Exp $ */
+/* $OpenBSD: sigreturn.s,v 1.3 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: sigreturn.s,v 1.2 1997/04/25 02:22:04 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/sunos_machdep.c b/sys/arch/m68k/m68k/sunos_machdep.c
index 5113db75894..2439694d7cb 100644
--- a/sys/arch/m68k/m68k/sunos_machdep.c
+++ b/sys/arch/m68k/m68k/sunos_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sunos_machdep.c,v 1.14 2002/06/04 00:09:08 deraadt Exp $ */
+/* $OpenBSD: sunos_machdep.c,v 1.15 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: sunos_machdep.c,v 1.12 1996/10/13 03:19:22 christos Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/support.s b/sys/arch/m68k/m68k/support.s
index 1fb5ee05824..cab75e4edbc 100644
--- a/sys/arch/m68k/m68k/support.s
+++ b/sys/arch/m68k/m68k/support.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: support.s,v 1.1 1997/03/26 08:23:55 downsj Exp $ */
+/* $OpenBSD: support.s,v 1.2 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: support.s,v 1.1 1997/03/16 10:47:33 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/m68k/m68k/trap_subr.s b/sys/arch/m68k/m68k/trap_subr.s
index bb2a570b20d..b7e1811624f 100644
--- a/sys/arch/m68k/m68k/trap_subr.s
+++ b/sys/arch/m68k/m68k/trap_subr.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap_subr.s,v 1.1 1997/07/06 07:46:31 downsj Exp $ */
+/* $OpenBSD: trap_subr.s,v 1.2 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: trap_subr.s,v 1.2 1997/06/04 22:12:43 is Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/dev/grf.c b/sys/arch/mac68k/dev/grf.c
index d5d43bca1a1..8f9de859806 100644
--- a/sys/arch/mac68k/dev/grf.c
+++ b/sys/arch/mac68k/dev/grf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf.c,v 1.23 2003/05/09 23:09:21 art Exp $ */
+/* $OpenBSD: grf.c,v 1.24 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: grf.c,v 1.41 1997/02/24 06:20:04 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/dev/grfvar.h b/sys/arch/mac68k/dev/grfvar.h
index f959b5698e7..05aaafe1641 100644
--- a/sys/arch/mac68k/dev/grfvar.h
+++ b/sys/arch/mac68k/dev/grfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grfvar.h,v 1.11 2002/03/14 03:15:55 millert Exp $ */
+/* $OpenBSD: grfvar.h,v 1.12 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: grfvar.h,v 1.11 1996/08/04 06:03:58 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/dev/ite.c b/sys/arch/mac68k/dev/ite.c
index 86d961f5f45..278537ddd6c 100644
--- a/sys/arch/mac68k/dev/ite.c
+++ b/sys/arch/mac68k/dev/ite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite.c,v 1.21 2002/06/11 05:13:37 miod Exp $ */
+/* $OpenBSD: ite.c,v 1.22 2003/06/02 23:27:48 millert Exp $ */
/* $NetBSD: ite.c,v 1.32 1997/02/20 00:23:25 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/dev/z8530reg.h b/sys/arch/mac68k/dev/z8530reg.h
index 082373f2433..cc3224ba9d5 100644
--- a/sys/arch/mac68k/dev/z8530reg.h
+++ b/sys/arch/mac68k/dev/z8530reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530reg.h,v 1.3 1996/05/26 18:35:36 briggs Exp $ */
+/* $OpenBSD: z8530reg.h,v 1.4 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530reg.h,v 1.3 1996/05/18 18:54:23 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/dev/z8530sc.c b/sys/arch/mac68k/dev/z8530sc.c
index d8db1cf2ebd..37a02ad2239 100644
--- a/sys/arch/mac68k/dev/z8530sc.c
+++ b/sys/arch/mac68k/dev/z8530sc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530sc.c,v 1.4 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: z8530sc.c,v 1.5 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530sc.c,v 1.1 1996/05/18 18:54:28 briggs Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/dev/z8530sc.h b/sys/arch/mac68k/dev/z8530sc.h
index 147c303ab8d..cbde3c453ed 100644
--- a/sys/arch/mac68k/dev/z8530sc.h
+++ b/sys/arch/mac68k/dev/z8530sc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530sc.h,v 1.4 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: z8530sc.h,v 1.5 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530sc.h,v 1.1 1996/05/18 18:54:30 briggs Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/dev/z8530tty.c b/sys/arch/mac68k/dev/z8530tty.c
index 57c918e1c87..707216f5bd0 100644
--- a/sys/arch/mac68k/dev/z8530tty.c
+++ b/sys/arch/mac68k/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530tty.c,v 1.11 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: z8530tty.c,v 1.12 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530tty.c,v 1.10 1996/12/18 05:17:44 scottr Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/dev/z8530tty.h b/sys/arch/mac68k/dev/z8530tty.h
index f79ce22466f..ba602c6c178 100644
--- a/sys/arch/mac68k/dev/z8530tty.h
+++ b/sys/arch/mac68k/dev/z8530tty.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530tty.h,v 1.2 1996/09/02 15:50:36 briggs Exp $ */
+/* $OpenBSD: z8530tty.h,v 1.3 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530tty.h,v 1.1 1996/05/18 18:54:35 briggs Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/dev/zsvar.h b/sys/arch/mac68k/dev/zsvar.h
index ae6899df984..a016be646c4 100644
--- a/sys/arch/mac68k/dev/zsvar.h
+++ b/sys/arch/mac68k/dev/zsvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: zsvar.h,v 1.3 1996/05/26 18:35:37 briggs Exp $ */
+/* $OpenBSD: zsvar.h,v 1.4 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: zsvar.h,v 1.2 1995/12/13 03:08:12 briggs Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index 8203c42bc60..a30f38fd03e 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.27 2002/06/07 21:33:43 nordin Exp $ */
+/* $OpenBSD: cpu.h,v 1.28 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/include/grfioctl.h b/sys/arch/mac68k/include/grfioctl.h
index 9ab5c2e4642..95e09392207 100644
--- a/sys/arch/mac68k/include/grfioctl.h
+++ b/sys/arch/mac68k/include/grfioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grfioctl.h,v 1.4 2003/04/03 06:47:58 jmc Exp $ */
+/* $OpenBSD: grfioctl.h,v 1.5 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: grfioctl.h,v 1.5 1995/07/02 05:26:45 briggs Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/include/param.h b/sys/arch/mac68k/include/param.h
index 4b7637f12d5..21a71052091 100644
--- a/sys/arch/mac68k/include/param.h
+++ b/sys/arch/mac68k/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.18 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: param.h,v 1.19 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: param.h,v 1.28 1997/03/01 06:57:45 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/include/pcb.h b/sys/arch/mac68k/include/pcb.h
index 2dd796997db..c94b5d99c2d 100644
--- a/sys/arch/mac68k/include/pcb.h
+++ b/sys/arch/mac68k/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.5 2003/02/24 01:13:11 miod Exp $ */
+/* $OpenBSD: pcb.h,v 1.6 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: pcb.h,v 1.7 1996/05/05 06:17:51 briggs Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/include/proc.h b/sys/arch/mac68k/include/proc.h
index baf1956d982..2f6296d9591 100644
--- a/sys/arch/mac68k/include/proc.h
+++ b/sys/arch/mac68k/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.5 2003/02/24 01:13:11 miod Exp $ */
+/* $OpenBSD: proc.h,v 1.6 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: proc.h,v 1.5 1994/10/26 08:46:40 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/include/vmparam.h b/sys/arch/mac68k/include/vmparam.h
index 015b505a71e..b42a30e0bbf 100644
--- a/sys/arch/mac68k/include/vmparam.h
+++ b/sys/arch/mac68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.14 2003/01/27 19:37:30 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.15 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: vmparam.h,v 1.8 1996/11/15 14:21:00 briggs Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/include/z8530var.h b/sys/arch/mac68k/include/z8530var.h
index 3b1851ebc2c..590f646a581 100644
--- a/sys/arch/mac68k/include/z8530var.h
+++ b/sys/arch/mac68k/include/z8530var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530var.h,v 1.5 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: z8530var.h,v 1.6 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530var.h,v 1.2 1996/06/07 10:27:19 briggs Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/autoconf.c b/sys/arch/mac68k/mac68k/autoconf.c
index 992dae377e5..065320b51e4 100644
--- a/sys/arch/mac68k/mac68k/autoconf.c
+++ b/sys/arch/mac68k/mac68k/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.18 2003/05/11 19:41:10 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.19 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: autoconf.c,v 1.38 1996/12/18 05:46:09 scottr Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/clock.c b/sys/arch/mac68k/mac68k/clock.c
index fc085e0e798..eda5931e108 100644
--- a/sys/arch/mac68k/mac68k/clock.c
+++ b/sys/arch/mac68k/mac68k/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.14 2002/04/24 21:53:11 espie Exp $ */
+/* $OpenBSD: clock.c,v 1.15 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: clock.c,v 1.36 1997/10/07 03:04:55 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 7c2d65cd1a1..aa6780c249d 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.33 2003/05/16 01:40:24 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.34 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c
index be91eb87580..f66a87ab783 100644
--- a/sys/arch/mac68k/mac68k/disksubr.c
+++ b/sys/arch/mac68k/mac68k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.22 2003/02/28 14:08:50 miod Exp $ */
+/* $OpenBSD: disksubr.c,v 1.23 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/genassym.cf b/sys/arch/mac68k/mac68k/genassym.cf
index e6391d1bdf0..1cb40a265e1 100644
--- a/sys/arch/mac68k/mac68k/genassym.cf
+++ b/sys/arch/mac68k/mac68k/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.12 2002/04/25 22:32:02 miod Exp $
+# $OpenBSD: genassym.cf,v 1.13 2003/06/02 23:27:49 millert Exp $
# $NetBSD: genassym.cf,v 1.7 1998/01/06 08:46:16 thorpej Exp $
#
@@ -13,11 +13,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/mac68k/mac68k/locore.s b/sys/arch/mac68k/mac68k/locore.s
index e16f603b218..33d564f9376 100644
--- a/sys/arch/mac68k/mac68k/locore.s
+++ b/sys/arch/mac68k/mac68k/locore.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.s,v 1.31 2002/04/25 22:49:51 miod Exp $ */
+/* $OpenBSD: locore.s,v 1.32 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: locore.s,v 1.103 1998/07/09 06:02:50 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index 6954f84acfd..e41b74c1593 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.106 2003/05/09 23:10:21 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.107 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/mem.c b/sys/arch/mac68k/mac68k/mem.c
index 641b396d880..63c0f055746 100644
--- a/sys/arch/mac68k/mac68k/mem.c
+++ b/sys/arch/mac68k/mac68k/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.17 2001/12/08 02:24:06 art Exp $ */
+/* $OpenBSD: mem.c,v 1.18 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: mem.c,v 1.22 1999/03/27 00:30:07 mycroft Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
index 5b11571d06b..2752c54eb96 100644
--- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c
+++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.24 2002/10/12 01:09:43 krw Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.25 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: pmap_bootstrap.c,v 1.50 1999/04/07 06:14:33 scottr Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/sys_machdep.c b/sys/arch/mac68k/mac68k/sys_machdep.c
index 27952d4543f..e58f7a60bd6 100644
--- a/sys/arch/mac68k/mac68k/sys_machdep.c
+++ b/sys/arch/mac68k/mac68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.7 2002/04/27 01:52:13 miod Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.8 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: sys_machdep.c,v 1.9 1996/05/05 06:18:58 briggs Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c
index 915b61fb4bd..d3f9971fc26 100644
--- a/sys/arch/mac68k/mac68k/trap.c
+++ b/sys/arch/mac68k/mac68k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.40 2003/01/09 22:27:09 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.41 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: trap.c,v 1.68 1998/12/22 08:47:07 scottr Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mac68k/mac68k/vm_machdep.c b/sys/arch/mac68k/mac68k/vm_machdep.c
index a3e95079f8a..544667864a4 100644
--- a/sys/arch/mac68k/mac68k/vm_machdep.c
+++ b/sys/arch/mac68k/mac68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.30 2002/04/27 01:52:13 miod Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.31 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: vm_machdep.c,v 1.29 1998/07/28 18:34:55 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c
index 2d1fa57864e..ba086122650 100644
--- a/sys/arch/macppc/dev/macintr.c
+++ b/sys/arch/macppc/dev/macintr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macintr.c,v 1.16 2003/02/12 22:40:59 jason Exp $ */
+/* $OpenBSD: macintr.c,v 1.17 2003/06/02 23:27:49 millert Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c
index a70312c33cb..04deaeb1332 100644
--- a/sys/arch/macppc/dev/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openpic.c,v 1.19 2003/02/12 22:40:59 jason Exp $ */
+/* $OpenBSD: openpic.c,v 1.20 2003/06/02 23:27:49 millert Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/macppc/dev/z8530reg.h b/sys/arch/macppc/dev/z8530reg.h
index 9b4bd925caf..6b5f741f0ab 100644
--- a/sys/arch/macppc/dev/z8530reg.h
+++ b/sys/arch/macppc/dev/z8530reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530reg.h,v 1.1 2002/09/06 13:56:51 drahn Exp $ */
+/* $OpenBSD: z8530reg.h,v 1.2 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530reg.h,v 1.9 1998/07/31 05:08:38 wrstuden Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/macppc/dev/z8530sc.c b/sys/arch/macppc/dev/z8530sc.c
index 96de093e249..73fc2d36d97 100644
--- a/sys/arch/macppc/dev/z8530sc.c
+++ b/sys/arch/macppc/dev/z8530sc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530sc.c,v 1.1 2002/09/06 13:56:51 drahn Exp $ */
+/* $OpenBSD: z8530sc.c,v 1.2 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530sc.c,v 1.4 1996/05/17 19:30:34 gwr Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/macppc/dev/z8530sc.h b/sys/arch/macppc/dev/z8530sc.h
index b3020c30eb0..bc2fcfb9c78 100644
--- a/sys/arch/macppc/dev/z8530sc.h
+++ b/sys/arch/macppc/dev/z8530sc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530sc.h,v 1.1 2002/09/06 13:56:51 drahn Exp $ */
+/* $OpenBSD: z8530sc.h,v 1.2 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530sc.h,v 1.15 2001/05/11 01:40:48 thorpej Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/macppc/dev/z8530tty.c b/sys/arch/macppc/dev/z8530tty.c
index fa5ed80f464..7387cd3145f 100644
--- a/sys/arch/macppc/dev/z8530tty.c
+++ b/sys/arch/macppc/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530tty.c,v 1.1 2002/09/06 13:56:51 drahn Exp $ */
+/* $OpenBSD: z8530tty.c,v 1.2 2003/06/02 23:27:49 millert Exp $ */
/* $NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $ */
/*-
@@ -53,11 +53,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/macppc/include/z8530var.h b/sys/arch/macppc/include/z8530var.h
index 157d03dc5fe..094b1549df8 100644
--- a/sys/arch/macppc/include/z8530var.h
+++ b/sys/arch/macppc/include/z8530var.h
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/macppc/macppc/autoconf.c b/sys/arch/macppc/macppc/autoconf.c
index 53c137f0a73..4bd07ec3d21 100644
--- a/sys/arch/macppc/macppc/autoconf.c
+++ b/sys/arch/macppc/macppc/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.9 2003/04/06 18:54:19 ho Exp $ */
+/* $OpenBSD: autoconf.c,v 1.10 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1996, 1997 Per Fogelstrom
* Copyright (c) 1995 Theo de Raadt
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
* from: Utah Hdr: autoconf.c 1.31 91/01/21
*
* from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93
- * $Id: autoconf.c,v 1.9 2003/04/06 18:54:19 ho Exp $
+ * $Id: autoconf.c,v 1.10 2003/06/02 23:27:50 millert Exp $
*/
/*
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index a583f052ffd..9a56d56f7ec 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.6 2003/02/26 20:17:23 drahn Exp $ */
+/* $OpenBSD: disksubr.c,v 1.7 2003/06/02 23:27:50 millert Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/macppc/macppc/genassym.cf b/sys/arch/macppc/macppc/genassym.cf
index ceb09fca300..abba3655fa4 100644
--- a/sys/arch/macppc/macppc/genassym.cf
+++ b/sys/arch/macppc/macppc/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.7 2002/09/15 09:01:58 deraadt Exp $
+# $OpenBSD: genassym.cf,v 1.8 2003/06/02 23:27:50 millert Exp $
#
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -11,11 +11,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/macppc/macppc/mem.c b/sys/arch/macppc/macppc/mem.c
index d804df07989..34706077a28 100644
--- a/sys/arch/macppc/macppc/mem.c
+++ b/sys/arch/macppc/macppc/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.8 2002/09/15 09:01:58 deraadt Exp $ */
+/* $OpenBSD: mem.c,v 1.9 2003/06/02 23:27:50 millert Exp $ */
/* $NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/clock.c b/sys/arch/mvme68k/dev/clock.c
index 1839c636942..d0836dd2fbb 100644
--- a/sys/arch/mvme68k/dev/clock.c
+++ b/sys/arch/mvme68k/dev/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.7 2003/06/02 05:09:14 deraadt Exp $ */
+/* $OpenBSD: clock.c,v 1.8 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -44,11 +44,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/dmavar.h b/sys/arch/mvme68k/dev/dmavar.h
index b473a900ea1..bc0368be1c4 100644
--- a/sys/arch/mvme68k/dev/dmavar.h
+++ b/sys/arch/mvme68k/dev/dmavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dmavar.h,v 1.3 1996/04/28 11:24:43 deraadt Exp $ */
+/* $OpenBSD: dmavar.h,v 1.4 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/if_le.c b/sys/arch/mvme68k/dev/if_le.c
index 19174504720..74c2c398d91 100644
--- a/sys/arch/mvme68k/dev/if_le.c
+++ b/sys/arch/mvme68k/dev/if_le.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le.c,v 1.20 2002/10/12 01:09:43 krw Exp $ */
+/* $OpenBSD: if_le.c,v 1.21 2003/06/02 23:27:50 millert Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/if_lereg.h b/sys/arch/mvme68k/dev/if_lereg.h
index 77cbc3aac96..df93aae91d6 100644
--- a/sys/arch/mvme68k/dev/if_lereg.h
+++ b/sys/arch/mvme68k/dev/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.6 2000/01/24 05:20:53 smurph Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.7 2003/06/02 23:27:50 millert Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/if_levar.h b/sys/arch/mvme68k/dev/if_levar.h
index 91f7750aba5..4887216e0f9 100644
--- a/sys/arch/mvme68k/dev/if_levar.h
+++ b/sys/arch/mvme68k/dev/if_levar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_levar.h,v 1.3 2001/07/04 08:06:52 niklas Exp $ */
+/* $OpenBSD: if_levar.h,v 1.4 2003/06/02 23:27:50 millert Exp $ */
/* $NetBSD: if_levar.h,v 1.5 1996/05/07 01:27:32 thorpej Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/nvramreg.h b/sys/arch/mvme68k/dev/nvramreg.h
index d23b535bc02..cc573968068 100644
--- a/sys/arch/mvme68k/dev/nvramreg.h
+++ b/sys/arch/mvme68k/dev/nvramreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nvramreg.h,v 1.3 1996/04/28 11:03:26 deraadt Exp $ */
+/* $OpenBSD: nvramreg.h,v 1.4 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/sbic.c b/sys/arch/mvme68k/dev/sbic.c
index 6df0819013b..89615a0d68b 100644
--- a/sys/arch/mvme68k/dev/sbic.c
+++ b/sys/arch/mvme68k/dev/sbic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbic.c,v 1.12 2003/02/11 19:20:26 mickey Exp $ */
+/* $OpenBSD: sbic.c,v 1.13 2003/06/02 23:27:50 millert Exp $ */
/* $NetBSD: sbic.c,v 1.2 1996/04/23 16:32:54 chuck Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/sbicreg.h b/sys/arch/mvme68k/dev/sbicreg.h
index b7e76e632b3..854664d71a7 100644
--- a/sys/arch/mvme68k/dev/sbicreg.h
+++ b/sys/arch/mvme68k/dev/sbicreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbicreg.h,v 1.5 2003/02/11 19:20:26 mickey Exp $ */
+/* $OpenBSD: sbicreg.h,v 1.6 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/sbicvar.h b/sys/arch/mvme68k/dev/sbicvar.h
index d0668ca6f69..f684d1d72a4 100644
--- a/sys/arch/mvme68k/dev/sbicvar.h
+++ b/sys/arch/mvme68k/dev/sbicvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbicvar.h,v 1.5 2002/03/14 01:26:37 millert Exp $ */
+/* $OpenBSD: sbicvar.h,v 1.6 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/ssh.c b/sys/arch/mvme68k/dev/ssh.c
index 76da2ca9579..bc09863d33c 100644
--- a/sys/arch/mvme68k/dev/ssh.c
+++ b/sys/arch/mvme68k/dev/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.4 2003/02/11 19:20:26 mickey Exp $ */
+/* $OpenBSD: ssh.c,v 1.5 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/sshdma.c b/sys/arch/mvme68k/dev/sshdma.c
index 32e2d098d2b..7752823d701 100644
--- a/sys/arch/mvme68k/dev/sshdma.c
+++ b/sys/arch/mvme68k/dev/sshdma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshdma.c,v 1.6 2003/02/11 19:20:26 mickey Exp $ */
+/* $OpenBSD: sshdma.c,v 1.7 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/sshreg.h b/sys/arch/mvme68k/dev/sshreg.h
index cd64f7d0eb1..771eabc8326 100644
--- a/sys/arch/mvme68k/dev/sshreg.h
+++ b/sys/arch/mvme68k/dev/sshreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshreg.h,v 1.3 2003/02/11 19:20:26 mickey Exp $ */
+/* $OpenBSD: sshreg.h,v 1.4 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/sshvar.h b/sys/arch/mvme68k/dev/sshvar.h
index b05426252f6..75939720a90 100644
--- a/sys/arch/mvme68k/dev/sshvar.h
+++ b/sys/arch/mvme68k/dev/sshvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshvar.h,v 1.2 2002/03/14 01:26:37 millert Exp $ */
+/* $OpenBSD: sshvar.h,v 1.3 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index 2fc813cd20a..af710fe7532 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs.c,v 1.9 2002/12/14 07:20:25 fgsch Exp $ */
+/* $OpenBSD: vs.c,v 1.10 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/vsreg.h b/sys/arch/mvme68k/dev/vsreg.h
index 1852fe03e18..3278889030c 100644
--- a/sys/arch/mvme68k/dev/vsreg.h
+++ b/sys/arch/mvme68k/dev/vsreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsreg.h,v 1.3 2002/03/14 01:26:37 millert Exp $ */
+/* $OpenBSD: vsreg.h,v 1.4 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1990 The Regents of the University of California.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/vsvar.h b/sys/arch/mvme68k/dev/vsvar.h
index 4095e672462..a4c4fb44fb6 100644
--- a/sys/arch/mvme68k/dev/vsvar.h
+++ b/sys/arch/mvme68k/dev/vsvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsvar.h,v 1.3 2002/04/27 23:21:05 miod Exp $ */
+/* $OpenBSD: vsvar.h,v 1.4 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c
index 877942d942b..50ee2be3fd5 100644
--- a/sys/arch/mvme68k/dev/wdsc.c
+++ b/sys/arch/mvme68k/dev/wdsc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdsc.c,v 1.7 2002/04/27 23:21:05 miod Exp $ */
+/* $OpenBSD: wdsc.c,v 1.8 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1996 Steve Woodford
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/dev/wdscreg.h b/sys/arch/mvme68k/dev/wdscreg.h
index e439e627751..08f47b9d658 100644
--- a/sys/arch/mvme68k/dev/wdscreg.h
+++ b/sys/arch/mvme68k/dev/wdscreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdscreg.h,v 1.1 1996/04/28 11:24:49 deraadt Exp $ */
+/* $OpenBSD: wdscreg.h,v 1.2 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index f1abc1a2781..60e98ed7666 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.15 2003/06/02 05:09:14 deraadt Exp $ */
+/* $OpenBSD: cpu.h,v 1.16 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -40,11 +40,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/include/param.h b/sys/arch/mvme68k/include/param.h
index 67626190349..626a20c5c88 100644
--- a/sys/arch/mvme68k/include/param.h
+++ b/sys/arch/mvme68k/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.18 2002/04/27 23:21:05 miod Exp $ */
+/* $OpenBSD: param.h,v 1.19 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/include/pcb.h b/sys/arch/mvme68k/include/pcb.h
index bbdee873ac5..d7b66947316 100644
--- a/sys/arch/mvme68k/include/pcb.h
+++ b/sys/arch/mvme68k/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.4 1997/03/31 00:24:04 downsj Exp $ */
+/* $OpenBSD: pcb.h,v 1.5 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/include/proc.h b/sys/arch/mvme68k/include/proc.h
index f55f547f83b..29c59af72dd 100644
--- a/sys/arch/mvme68k/include/proc.h
+++ b/sys/arch/mvme68k/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.5 1997/03/31 00:24:06 downsj Exp $ */
+/* $OpenBSD: proc.h,v 1.6 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/include/vmparam.h b/sys/arch/mvme68k/include/vmparam.h
index 4c7a1bbf41b..8ae86521f47 100644
--- a/sys/arch/mvme68k/include/vmparam.h
+++ b/sys/arch/mvme68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.14 2003/01/27 19:37:30 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.15 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c
index d2b9edb6277..2c1a2f2a561 100644
--- a/sys/arch/mvme68k/mvme68k/autoconf.c
+++ b/sys/arch/mvme68k/mvme68k/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.21 2003/06/02 05:09:14 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.22 2003/06/02 23:27:50 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -40,11 +40,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index d7fa598a61d..5962860b323 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.33 2003/06/02 05:09:14 deraadt Exp $ */
+/* $OpenBSD: conf.c,v 1.34 2003/06/02 23:27:50 millert Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -35,11 +35,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/dkbad.c b/sys/arch/mvme68k/mvme68k/dkbad.c
index 43991c5083c..70cdbccb636 100644
--- a/sys/arch/mvme68k/mvme68k/dkbad.c
+++ b/sys/arch/mvme68k/mvme68k/dkbad.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dkbad.c,v 1.6 2002/04/27 23:21:06 miod Exp $ */
+/* $OpenBSD: dkbad.c,v 1.7 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/genassym.cf b/sys/arch/mvme68k/mvme68k/genassym.cf
index f1b810be0cb..800b28ef486 100644
--- a/sys/arch/mvme68k/mvme68k/genassym.cf
+++ b/sys/arch/mvme68k/mvme68k/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.17 2003/06/02 05:09:14 deraadt Exp $
+# $OpenBSD: genassym.cf,v 1.18 2003/06/02 23:27:51 millert Exp $
#
# Copyright (c) 1995 Theo de Raadt
@@ -35,11 +35,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s
index da94f18fc19..7889b0e4a26 100644
--- a/sys/arch/mvme68k/mvme68k/locore.s
+++ b/sys/arch/mvme68k/mvme68k/locore.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.s,v 1.35 2003/06/02 05:09:14 deraadt Exp $ */
+/* $OpenBSD: locore.s,v 1.36 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 33464e3f0f1..cd6dd30bce5 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.76 2003/06/02 05:09:14 deraadt Exp $ */
+/* $OpenBSD: machdep.c,v 1.77 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/mem.c b/sys/arch/mvme68k/mvme68k/mem.c
index 6d352356bff..0bddbb0fe1b 100644
--- a/sys/arch/mvme68k/mvme68k/mem.c
+++ b/sys/arch/mvme68k/mvme68k/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.20 2003/06/02 05:09:14 deraadt Exp $ */
+/* $OpenBSD: mem.c,v 1.21 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -40,11 +40,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
index 352a5ae687f..ccbe1e122b8 100644
--- a/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
+++ b/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.17 2003/06/02 05:09:14 deraadt Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.18 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -40,11 +40,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/sys_machdep.c b/sys/arch/mvme68k/mvme68k/sys_machdep.c
index caa1f459304..4f3773f7f98 100644
--- a/sys/arch/mvme68k/mvme68k/sys_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.13 2002/04/27 23:21:06 miod Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.14 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/trap.c b/sys/arch/mvme68k/mvme68k/trap.c
index 48f894f5d22..6ebeba9a82d 100644
--- a/sys/arch/mvme68k/mvme68k/trap.c
+++ b/sys/arch/mvme68k/mvme68k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.49 2003/06/02 05:09:14 deraadt Exp $ */
+/* $OpenBSD: trap.c,v 1.50 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/mvme68k/vm_machdep.c b/sys/arch/mvme68k/mvme68k/vm_machdep.c
index a8d66141f7e..a56f6880689 100644
--- a/sys/arch/mvme68k/mvme68k/vm_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.36 2003/05/30 20:37:42 miod Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.37 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/stand/bootsd/boot.c b/sys/arch/mvme68k/stand/bootsd/boot.c
index 4dda499227d..68baed9d3e9 100644
--- a/sys/arch/mvme68k/stand/bootsd/boot.c
+++ b/sys/arch/mvme68k/stand/bootsd/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.10 1997/04/22 16:01:19 gvf Exp $ */
+/* $OpenBSD: boot.c,v 1.11 2003/06/02 23:27:51 millert Exp $ */
/* $NetBSD: boot.c,v 1.2 1995/09/23 03:42:52 gwr Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/stand/bootst/boot.c b/sys/arch/mvme68k/stand/bootst/boot.c
index fbadbab65c9..8c74d3d0a16 100644
--- a/sys/arch/mvme68k/stand/bootst/boot.c
+++ b/sys/arch/mvme68k/stand/bootst/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.2 1997/04/22 16:02:20 gvf Exp $ */
+/* $OpenBSD: boot.c,v 1.3 2003/06/02 23:27:51 millert Exp $ */
/* $NetBSD: boot.c,v 1.2 1995/10/17 22:58:14 gwr Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/stand/libsa/exec_mvme.c b/sys/arch/mvme68k/stand/libsa/exec_mvme.c
index e8ea192ccbb..1718092ecaa 100644
--- a/sys/arch/mvme68k/stand/libsa/exec_mvme.c
+++ b/sys/arch/mvme68k/stand/libsa/exec_mvme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_mvme.c,v 1.4 2002/03/14 03:15:56 millert Exp $ */
+/* $OpenBSD: exec_mvme.c,v 1.5 2003/06/02 23:27:51 millert Exp $ */
/* $NetBSD: exec_sun.c,v 1.5 1996/01/29 23:41:06 gwr Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/stand/netboot/boot.c b/sys/arch/mvme68k/stand/netboot/boot.c
index 1cefa334041..1bbfd3ec60a 100644
--- a/sys/arch/mvme68k/stand/netboot/boot.c
+++ b/sys/arch/mvme68k/stand/netboot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.7 2000/01/06 03:21:44 smurph Exp $ */
+/* $OpenBSD: boot.c,v 1.8 2003/06/02 23:27:51 millert Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/stand/netboot/if_lereg.h b/sys/arch/mvme68k/stand/netboot/if_lereg.h
index dd84f6171e1..24b382990ff 100644
--- a/sys/arch/mvme68k/stand/netboot/if_lereg.h
+++ b/sys/arch/mvme68k/stand/netboot/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.4 2000/12/21 16:54:55 aaron Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.5 2003/06/02 23:27:51 millert Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/stand/sboot/clock.c b/sys/arch/mvme68k/stand/sboot/clock.c
index cfd70c846f6..9e9b71602d3 100644
--- a/sys/arch/mvme68k/stand/sboot/clock.c
+++ b/sys/arch/mvme68k/stand/sboot/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.5 1997/01/29 07:58:35 deraadt Exp $ */
+/* $OpenBSD: clock.c,v 1.6 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/stand/sboot/clockreg.h b/sys/arch/mvme68k/stand/sboot/clockreg.h
index cfd00fb2a78..11694225b4f 100644
--- a/sys/arch/mvme68k/stand/sboot/clockreg.h
+++ b/sys/arch/mvme68k/stand/sboot/clockreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clockreg.h,v 1.3 1996/04/28 10:49:35 deraadt Exp $ */
+/* $OpenBSD: clockreg.h,v 1.4 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme68k/stand/sboot/if_lereg.h b/sys/arch/mvme68k/stand/sboot/if_lereg.h
index c35ceac5078..9adc3de7132 100644
--- a/sys/arch/mvme68k/stand/sboot/if_lereg.h
+++ b/sys/arch/mvme68k/stand/sboot/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.4 2000/12/21 16:54:55 aaron Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.5 2003/06/02 23:27:51 millert Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c
index 0991a56fd30..cc2647764d5 100644
--- a/sys/arch/mvme88k/dev/clock.c
+++ b/sys/arch/mvme88k/dev/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.20 2003/06/02 07:06:56 deraadt Exp $ */
+/* $OpenBSD: clock.c,v 1.21 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1995 Theo de Raadt
@@ -47,11 +47,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/if_ve.c b/sys/arch/mvme88k/dev/if_ve.c
index 6b37b8aaa01..2214c8f92fd 100644
--- a/sys/arch/mvme88k/dev/if_ve.c
+++ b/sys/arch/mvme88k/dev/if_ve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ve.c,v 1.18 2002/04/28 15:17:09 miod Exp $ */
+/* $OpenBSD: if_ve.c,v 1.19 2003/06/02 23:27:51 millert Exp $ */
/*-
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1982, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/if_vereg.h b/sys/arch/mvme88k/dev/if_vereg.h
index aece081683f..6284fd65b5e 100644
--- a/sys/arch/mvme88k/dev/if_vereg.h
+++ b/sys/arch/mvme88k/dev/if_vereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vereg.h,v 1.3 2001/02/12 08:16:23 smurph Exp $ */
+/* $OpenBSD: if_vereg.h,v 1.4 2003/06/02 23:27:51 millert Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/nvramreg.h b/sys/arch/mvme88k/dev/nvramreg.h
index 0990817d113..1ad006e44b6 100644
--- a/sys/arch/mvme88k/dev/nvramreg.h
+++ b/sys/arch/mvme88k/dev/nvramreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nvramreg.h,v 1.4 2002/04/28 15:17:09 miod Exp $ */
+/* $OpenBSD: nvramreg.h,v 1.5 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/sclock.c b/sys/arch/mvme88k/dev/sclock.c
index 1be4d05324b..9b598fd5abd 100644
--- a/sys/arch/mvme88k/dev/sclock.c
+++ b/sys/arch/mvme88k/dev/sclock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sclock.c,v 1.13 2003/06/02 07:06:56 deraadt Exp $ */
+/* $OpenBSD: sclock.c,v 1.14 2003/06/02 23:27:51 millert Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
*
@@ -46,11 +46,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/ssh.c b/sys/arch/mvme88k/dev/ssh.c
index 415b6855040..9e8bd9fe18d 100644
--- a/sys/arch/mvme88k/dev/ssh.c
+++ b/sys/arch/mvme88k/dev/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.13 2003/02/11 19:20:26 mickey Exp $ */
+/* $OpenBSD: ssh.c,v 1.14 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/sshdma.c b/sys/arch/mvme88k/dev/sshdma.c
index ddf78f00451..176edc072c5 100644
--- a/sys/arch/mvme88k/dev/sshdma.c
+++ b/sys/arch/mvme88k/dev/sshdma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshdma.c,v 1.11 2002/03/14 01:26:39 millert Exp $ */
+/* $OpenBSD: sshdma.c,v 1.12 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/sshreg.h b/sys/arch/mvme88k/dev/sshreg.h
index 232f555a979..290d2c21e41 100644
--- a/sys/arch/mvme88k/dev/sshreg.h
+++ b/sys/arch/mvme88k/dev/sshreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshreg.h,v 1.3 2003/02/11 19:20:26 mickey Exp $ */
+/* $OpenBSD: sshreg.h,v 1.4 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/sshvar.h b/sys/arch/mvme88k/dev/sshvar.h
index c63f6a653e2..a30d299f41d 100644
--- a/sys/arch/mvme88k/dev/sshvar.h
+++ b/sys/arch/mvme88k/dev/sshvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshvar.h,v 1.2 2002/03/14 01:26:39 millert Exp $ */
+/* $OpenBSD: sshvar.h,v 1.3 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index d0ce745d4ca..46ecc7401cc 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vs.c,v 1.18 2002/12/14 07:20:25 fgsch Exp $ */
+/* $OpenBSD: vs.c,v 1.19 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/vsreg.h b/sys/arch/mvme88k/dev/vsreg.h
index 386ef0e15eb..71283f36559 100644
--- a/sys/arch/mvme88k/dev/vsreg.h
+++ b/sys/arch/mvme88k/dev/vsreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsreg.h,v 1.3 2001/02/01 03:38:16 smurph Exp $ */
+/* $OpenBSD: vsreg.h,v 1.4 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1990 The Regents of the University of California.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/dev/vsvar.h b/sys/arch/mvme88k/dev/vsvar.h
index d235caf7526..b9092a65db9 100644
--- a/sys/arch/mvme88k/dev/vsvar.h
+++ b/sys/arch/mvme88k/dev/vsvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vsvar.h,v 1.5 2002/03/14 01:26:39 millert Exp $ */
+/* $OpenBSD: vsvar.h,v 1.6 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/include/ansi.h b/sys/arch/mvme88k/include/ansi.h
index e51dfa3a739..41f9a0ca7bd 100644
--- a/sys/arch/mvme88k/include/ansi.h
+++ b/sys/arch/mvme88k/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.13 2002/03/23 23:27:13 miod Exp $ */
+/* $OpenBSD: ansi.h,v 1.14 2003/06/02 23:27:52 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
index 0996b338d50..3fd474334a2 100644
--- a/sys/arch/mvme88k/include/cpu.h
+++ b/sys/arch/mvme88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.19 2002/06/07 21:33:43 nordin Exp $ */
+/* $OpenBSD: cpu.h,v 1.20 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/include/float.h b/sys/arch/mvme88k/include/float.h
index 12ca769eea8..8717c7ff0f4 100644
--- a/sys/arch/mvme88k/include/float.h
+++ b/sys/arch/mvme88k/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.6 2002/03/14 01:26:39 millert Exp $ */
+/* $OpenBSD: float.h,v 1.7 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1989 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/include/frame.h b/sys/arch/mvme88k/include/frame.h
index 8b76cc617b7..58ffd088b8b 100644
--- a/sys/arch/mvme88k/include/frame.h
+++ b/sys/arch/mvme88k/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.4 2001/08/11 23:51:50 miod Exp $ */
+/* $OpenBSD: frame.h,v 1.5 2003/06/02 23:27:52 millert Exp $ */
/* $NetBSD: frame.h,v 1.15 1997/05/03 12:49:05 mycroft Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/include/ieee.h b/sys/arch/mvme88k/include/ieee.h
index 92e200216ec..dbf9cbe0e62 100644
--- a/sys/arch/mvme88k/include/ieee.h
+++ b/sys/arch/mvme88k/include/ieee.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee.h,v 1.4 2001/08/12 12:03:02 heko Exp $ */
+/* $OpenBSD: ieee.h,v 1.5 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -20,11 +20,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/include/limits.h b/sys/arch/mvme88k/include/limits.h
index 7cb7cbe44f9..fa5482d3a13 100644
--- a/sys/arch/mvme88k/include/limits.h
+++ b/sys/arch/mvme88k/include/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.10 2002/07/30 01:22:00 millert Exp $ */
+/* $OpenBSD: limits.h,v 1.11 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -32,7 +28,7 @@
* SUCH DAMAGE.
*
* from: @(#)limits.h 8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.10 2002/07/30 01:22:00 millert Exp $
+ * $Id: limits.h,v 1.11 2003/06/02 23:27:52 millert Exp $
*/
#ifndef _MACHINE_LIMITS_H_
diff --git a/sys/arch/mvme88k/include/mmu.h b/sys/arch/mvme88k/include/mmu.h
index a6820fde23c..a1bd7dba0d0 100644
--- a/sys/arch/mvme88k/include/mmu.h
+++ b/sys/arch/mvme88k/include/mmu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mmu.h,v 1.18 2003/01/24 09:57:41 miod Exp $ */
+/* $OpenBSD: mmu.h,v 1.19 2003/06/02 23:27:52 millert Exp $ */
/*
* This file bears almost no resemblance to the original m68k file,
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/include/param.h b/sys/arch/mvme88k/include/param.h
index 5a8ed66f9c3..74ae319853b 100644
--- a/sys/arch/mvme88k/include/param.h
+++ b/sys/arch/mvme88k/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.27 2002/03/14 01:26:39 millert Exp $ */
+/* $OpenBSD: param.h,v 1.28 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/include/proc.h b/sys/arch/mvme88k/include/proc.h
index b6cbaa354e8..7df9e7ba0d7 100644
--- a/sys/arch/mvme88k/include/proc.h
+++ b/sys/arch/mvme88k/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.8 2001/08/12 12:03:02 heko Exp $ */
+/* $OpenBSD: proc.h,v 1.9 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -20,11 +20,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@
* @(#)proc.h 8.1 (Berkeley) 6/11/93
*
* from: Header: proc.h,v 1.6 92/11/26 02:04:41 torek Exp (LBL)
- * $Id: proc.h,v 1.8 2001/08/12 12:03:02 heko Exp $
+ * $Id: proc.h,v 1.9 2003/06/02 23:27:52 millert Exp $
*/
#ifndef __MACHINE_PROC_H__
diff --git a/sys/arch/mvme88k/include/profile.h b/sys/arch/mvme88k/include/profile.h
index 0bb72be7fb9..9bfb56ace4a 100644
--- a/sys/arch/mvme88k/include/profile.h
+++ b/sys/arch/mvme88k/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.11 2001/08/12 12:03:02 heko Exp $ */
+/* $OpenBSD: profile.h,v 1.12 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -33,7 +29,7 @@
* SUCH DAMAGE.
*
* from: @(#)profile.h 8.1 (Berkeley) 6/11/93
- * $Id: profile.h,v 1.11 2001/08/12 12:03:02 heko Exp $
+ * $Id: profile.h,v 1.12 2003/06/02 23:27:52 millert Exp $
*/
#ifndef __MACHINE_PROFILE_H__
#define __MACHINE_PROFILE_H__
diff --git a/sys/arch/mvme88k/include/ptrace.h b/sys/arch/mvme88k/include/ptrace.h
index b5022b84acf..a777ec4208a 100644
--- a/sys/arch/mvme88k/include/ptrace.h
+++ b/sys/arch/mvme88k/include/ptrace.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ptrace.h,v 1.6 2001/08/12 12:03:02 heko Exp $ */
+/* $OpenBSD: ptrace.h,v 1.7 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1999, Steve Murphree, Jr.
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -44,7 +40,7 @@
* @(#)ptrace.h 8.1 (Berkeley) 6/11/93
*
* from: Header: ptrace.h,v 1.6 92/11/26 02:04:43 torek Exp (LBL)
- * $Id: ptrace.h,v 1.6 2001/08/12 12:03:02 heko Exp $
+ * $Id: ptrace.h,v 1.7 2003/06/02 23:27:52 millert Exp $
*/
/*
diff --git a/sys/arch/mvme88k/include/types.h b/sys/arch/mvme88k/include/types.h
index e4c311a2e30..6fd54fa8cc9 100644
--- a/sys/arch/mvme88k/include/types.h
+++ b/sys/arch/mvme88k/include/types.h
@@ -1,5 +1,5 @@
/* $NetBSD: types.h,v 1.7 1995/07/05 17:46:11 pk Exp $ */
-/* $OpenBSD: types.h,v 1.9 2001/08/11 01:58:34 art Exp $ */
+/* $OpenBSD: types.h,v 1.10 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 6989305e7c7..cc578bec58c 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.25 2003/05/14 00:20:37 tedu Exp $ */
+/* $OpenBSD: conf.c,v 1.26 2003/06/02 23:27:52 millert Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/mvme88k/dkbad.c b/sys/arch/mvme88k/mvme88k/dkbad.c
index 3bf7315ab67..bdff1ef6e64 100644
--- a/sys/arch/mvme88k/mvme88k/dkbad.c
+++ b/sys/arch/mvme88k/mvme88k/dkbad.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dkbad.c,v 1.6 2002/03/14 01:26:40 millert Exp $ */
+/* $OpenBSD: dkbad.c,v 1.7 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/mvme88k/genassym.cf b/sys/arch/mvme88k/mvme88k/genassym.cf
index 617dfef1980..29b9d35a4ee 100644
--- a/sys/arch/mvme88k/mvme88k/genassym.cf
+++ b/sys/arch/mvme88k/mvme88k/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.5 2001/12/22 17:54:23 smurph Exp $
+# $OpenBSD: genassym.cf,v 1.6 2003/06/02 23:27:52 millert Exp $
#
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -11,11 +11,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
@@ -32,7 +28,7 @@
# SUCH DAMAGE.
#
# @(#)genassym.c 7.8 (Berkeley) 5/7/91
-# $Id: genassym.cf,v 1.5 2001/12/22 17:54:23 smurph Exp $
+# $Id: genassym.cf,v 1.6 2003/06/02 23:27:52 millert Exp $
#
include <sys/param.h>
diff --git a/sys/arch/mvme88k/mvme88k/mem.c b/sys/arch/mvme88k/mvme88k/mem.c
index 451b75f26d9..ade674bfc4f 100644
--- a/sys/arch/mvme88k/mvme88k/mem.c
+++ b/sys/arch/mvme88k/mvme88k/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.17 2003/01/04 01:12:08 miod Exp $ */
+/* $OpenBSD: mem.c,v 1.18 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/mvme88k/process_machdep.c b/sys/arch/mvme88k/mvme88k/process_machdep.c
index 9866e9e55b2..57ee231cb83 100644
--- a/sys/arch/mvme88k/mvme88k/process_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/process_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process_machdep.c,v 1.10 2002/03/14 00:42:24 miod Exp $ */
+/* $OpenBSD: process_machdep.c,v 1.11 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1993 The Regents of the University of California.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/mvme88k/vm_machdep.c b/sys/arch/mvme88k/mvme88k/vm_machdep.c
index 40e50273754..ec64f9caf6c 100644
--- a/sys/arch/mvme88k/mvme88k/vm_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm_machdep.c,v 1.51 2003/06/01 00:22:12 miod Exp $ */
+/* $OpenBSD: vm_machdep.c,v 1.52 2003/06/02 23:27:52 millert Exp $ */
/*
* Copyright (c) 1998 Steve Murphree, Jr.
@@ -20,11 +20,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/stand/bootsd/boot.c b/sys/arch/mvme88k/stand/bootsd/boot.c
index 4ff215865c2..99c8553eb36 100644
--- a/sys/arch/mvme88k/stand/bootsd/boot.c
+++ b/sys/arch/mvme88k/stand/bootsd/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.6 2001/06/29 21:53:28 miod Exp $ */
+/* $OpenBSD: boot.c,v 1.7 2003/06/02 23:27:52 millert Exp $ */
/* $NetBSD: boot.c,v 1.2 1995/09/23 03:42:52 gwr Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/stand/bootst/boot.c b/sys/arch/mvme88k/stand/bootst/boot.c
index adec6f12d66..7c937bcc0c4 100644
--- a/sys/arch/mvme88k/stand/bootst/boot.c
+++ b/sys/arch/mvme88k/stand/bootst/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.2 1999/09/27 19:29:59 smurph Exp $ */
+/* $OpenBSD: boot.c,v 1.3 2003/06/02 23:27:52 millert Exp $ */
/*-
* Changes Copyright (c) 1998 steve Murphree, Jr.
* Copyright (c) 1982, 1986, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/stand/libsa/exec_mvme.c b/sys/arch/mvme88k/stand/libsa/exec_mvme.c
index 97a5e5faac0..49a0666fb3d 100644
--- a/sys/arch/mvme88k/stand/libsa/exec_mvme.c
+++ b/sys/arch/mvme88k/stand/libsa/exec_mvme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_mvme.c,v 1.8 2002/03/14 03:15:58 millert Exp $ */
+/* $OpenBSD: exec_mvme.c,v 1.9 2003/06/02 23:27:52 millert Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/stand/netboot/boot.c b/sys/arch/mvme88k/stand/netboot/boot.c
index 7442894db37..f7ccfc9502a 100644
--- a/sys/arch/mvme88k/stand/netboot/boot.c
+++ b/sys/arch/mvme88k/stand/netboot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.4 1999/09/27 19:30:01 smurph Exp $ */
+/* $OpenBSD: boot.c,v 1.5 2003/06/02 23:27:52 millert Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/stand/netboot/if_lereg.h b/sys/arch/mvme88k/stand/netboot/if_lereg.h
index 23d41918234..c5ef3a72781 100644
--- a/sys/arch/mvme88k/stand/netboot/if_lereg.h
+++ b/sys/arch/mvme88k/stand/netboot/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.3 2000/12/21 16:54:57 aaron Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.4 2003/06/02 23:27:52 millert Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/stand/sboot/clock.c b/sys/arch/mvme88k/stand/sboot/clock.c
index 5ed9f87d146..3eece5f0711 100644
--- a/sys/arch/mvme88k/stand/sboot/clock.c
+++ b/sys/arch/mvme88k/stand/sboot/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.2 2000/03/03 00:54:54 todd Exp $ */
+/* $OpenBSD: clock.c,v 1.3 2003/06/02 23:27:53 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/stand/sboot/clockreg.h b/sys/arch/mvme88k/stand/sboot/clockreg.h
index 8ec11e98bcb..78f7954215d 100644
--- a/sys/arch/mvme88k/stand/sboot/clockreg.h
+++ b/sys/arch/mvme88k/stand/sboot/clockreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clockreg.h,v 1.2 2000/03/03 00:54:54 todd Exp $ */
+/* $OpenBSD: clockreg.h,v 1.3 2003/06/02 23:27:53 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvme88k/stand/sboot/if_lereg.h b/sys/arch/mvme88k/stand/sboot/if_lereg.h
index d702f3b1867..35c4a8901a9 100644
--- a/sys/arch/mvme88k/stand/sboot/if_lereg.h
+++ b/sys/arch/mvme88k/stand/sboot/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.3 2000/12/21 16:54:57 aaron Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.4 2003/06/02 23:27:53 millert Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/dev/mem.c b/sys/arch/mvmeppc/dev/mem.c
index 6ac65506f72..323a6ae37bb 100644
--- a/sys/arch/mvmeppc/dev/mem.c
+++ b/sys/arch/mvmeppc/dev/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.6 2002/06/08 15:47:31 miod Exp $ */
+/* $OpenBSD: mem.c,v 1.7 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/dev/nvramreg.h b/sys/arch/mvmeppc/dev/nvramreg.h
index 96c2737f75b..0ea3e1873e1 100644
--- a/sys/arch/mvmeppc/dev/nvramreg.h
+++ b/sys/arch/mvmeppc/dev/nvramreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nvramreg.h,v 1.1 2001/06/26 21:57:41 smurph Exp $ */
+/* $OpenBSD: nvramreg.h,v 1.2 2003/06/02 23:27:53 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/dev/openpic.c b/sys/arch/mvmeppc/dev/openpic.c
index d2fc263db0c..37df045e6d5 100644
--- a/sys/arch/mvmeppc/dev/openpic.c
+++ b/sys/arch/mvmeppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openpic.c,v 1.9 2002/06/08 15:49:52 miod Exp $ */
+/* $OpenBSD: openpic.c,v 1.10 2003/06/02 23:27:53 millert Exp $ */
/*-
* Copyright (c) 1995 Per Fogelstrom
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/isa/isa_machdep.c b/sys/arch/mvmeppc/isa/isa_machdep.c
index 18d8760304c..e85f25d6c83 100644
--- a/sys/arch/mvmeppc/isa/isa_machdep.c
+++ b/sys/arch/mvmeppc/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.5 2002/06/08 15:49:58 miod Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.6 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */
#define ISA_DMA_STATS
@@ -94,11 +94,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/isa/isa_machdep.h b/sys/arch/mvmeppc/isa/isa_machdep.h
index 7249d0ec941..90fdacf719f 100644
--- a/sys/arch/mvmeppc/isa/isa_machdep.h
+++ b/sys/arch/mvmeppc/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.3 2002/03/14 03:15:58 millert Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.4 2003/06/02 23:27:53 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/mvmeppc/autoconf.c b/sys/arch/mvmeppc/mvmeppc/autoconf.c
index 86fbf54eb3c..2b7f10fc13a 100644
--- a/sys/arch/mvmeppc/mvmeppc/autoconf.c
+++ b/sys/arch/mvmeppc/mvmeppc/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.6 2003/04/06 18:54:19 ho Exp $ */
+/* $OpenBSD: autoconf.c,v 1.7 2003/06/02 23:27:53 millert Exp $ */
/*
* Copyright (c) 1996, 1997 Per Fogelstrom
* Copyright (c) 1995 Theo de Raadt
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
* from: Utah Hdr: autoconf.c 1.31 91/01/21
*
* from: @(#)autoconf.c 8.1 (Berkeley) 6/10/93
- * $Id: autoconf.c,v 1.6 2003/04/06 18:54:19 ho Exp $
+ * $Id: autoconf.c,v 1.7 2003/06/02 23:27:53 millert Exp $
*/
/*
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index 229b1232619..dca5aa5ff7a 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.4 2002/03/14 01:26:41 millert Exp $ */
+/* $OpenBSD: disksubr.c,v 1.5 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/mvmeppc/genassym.cf b/sys/arch/mvmeppc/mvmeppc/genassym.cf
index 9d3aa02c871..1e4ffed4214 100644
--- a/sys/arch/mvmeppc/mvmeppc/genassym.cf
+++ b/sys/arch/mvmeppc/mvmeppc/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.4 2001/11/06 19:53:15 miod Exp $
+# $OpenBSD: genassym.cf,v 1.5 2003/06/02 23:27:53 millert Exp $
#
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -11,11 +11,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/mvmeppc/stand/bootsd/boot.c b/sys/arch/mvmeppc/stand/bootsd/boot.c
index ef1102c5929..a8244fdefc6 100644
--- a/sys/arch/mvmeppc/stand/bootsd/boot.c
+++ b/sys/arch/mvmeppc/stand/bootsd/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.2 2001/08/25 20:36:51 miod Exp $ */
+/* $OpenBSD: boot.c,v 1.3 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: boot.c,v 1.2 1995/09/23 03:42:52 gwr Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/stand/bootst/boot.c b/sys/arch/mvmeppc/stand/bootst/boot.c
index 1db477b2abf..732bc17f32d 100644
--- a/sys/arch/mvmeppc/stand/bootst/boot.c
+++ b/sys/arch/mvmeppc/stand/bootst/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.1 2001/06/26 21:58:00 smurph Exp $ */
+/* $OpenBSD: boot.c,v 1.2 2003/06/02 23:27:53 millert Exp $ */
/*-
* Changes Copyright (c) 1998 steve Murphree, Jr.
* Copyright (c) 1982, 1986, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/stand/libsa/exec_mvme.c b/sys/arch/mvmeppc/stand/libsa/exec_mvme.c
index 4476cbfacd5..528c5a8d732 100644
--- a/sys/arch/mvmeppc/stand/libsa/exec_mvme.c
+++ b/sys/arch/mvmeppc/stand/libsa/exec_mvme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_mvme.c,v 1.2 2001/07/04 08:31:38 niklas Exp $ */
+/* $OpenBSD: exec_mvme.c,v 1.3 2003/06/02 23:27:53 millert Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/mvmeppc/stand/tftpboot/boot.c b/sys/arch/mvmeppc/stand/tftpboot/boot.c
index 0c33a81359a..f676e0cb1bf 100644
--- a/sys/arch/mvmeppc/stand/tftpboot/boot.c
+++ b/sys/arch/mvmeppc/stand/tftpboot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.2 2003/06/02 18:47:58 deraadt Exp $ */
+/* $OpenBSD: boot.c,v 1.3 2003/06/02 23:27:53 millert Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
* Copyright (c) 2001 Steve Murphree, Jr.
@@ -36,11 +36,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/powerpc/include/ansi.h b/sys/arch/powerpc/include/ansi.h
index 83582fa90a7..f5d5d1f1df7 100644
--- a/sys/arch/powerpc/include/ansi.h
+++ b/sys/arch/powerpc/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.9 2002/09/15 09:01:59 deraadt Exp $ */
+/* $OpenBSD: ansi.h,v 1.10 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: ansi.h,v 1.2 1996/11/15 22:38:57 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/powerpc/include/float.h b/sys/arch/powerpc/include/float.h
index 070abe4376f..73328987b45 100644
--- a/sys/arch/powerpc/include/float.h
+++ b/sys/arch/powerpc/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.6 2002/03/14 01:26:41 millert Exp $ */
+/* $OpenBSD: float.h,v 1.7 2003/06/02 23:27:53 millert Exp $ */
/*
* Copyright (c) 1989 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/powerpc/include/ieee.h b/sys/arch/powerpc/include/ieee.h
index 67ab104196e..ffa6bf97811 100644
--- a/sys/arch/powerpc/include/ieee.h
+++ b/sys/arch/powerpc/include/ieee.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee.h,v 1.3 1997/10/13 10:53:45 pefo Exp $ */
+/* $OpenBSD: ieee.h,v 1.4 2003/06/02 23:27:53 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/powerpc/include/reg.h b/sys/arch/powerpc/include/reg.h
index 2a7003222b8..8244be57aac 100644
--- a/sys/arch/powerpc/include/reg.h
+++ b/sys/arch/powerpc/include/reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reg.h,v 1.8 2002/09/15 09:01:59 deraadt Exp $ */
+/* $OpenBSD: reg.h,v 1.9 2003/06/02 23:27:53 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/powerpc/include/stdarg.h b/sys/arch/powerpc/include/stdarg.h
index dc432bc3f60..9c23da50f7e 100644
--- a/sys/arch/powerpc/include/stdarg.h
+++ b/sys/arch/powerpc/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.4 2001/09/01 15:49:05 drahn Exp $ */
+/* $OpenBSD: stdarg.h,v 1.5 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: stdarg.h,v 1.1 1996/09/30 16:34:35 ws Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/powerpc/include/varargs.h b/sys/arch/powerpc/include/varargs.h
index 4f01472a81c..4330af8f837 100644
--- a/sys/arch/powerpc/include/varargs.h
+++ b/sys/arch/powerpc/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.3 2001/09/01 15:49:05 drahn Exp $ */
+/* $OpenBSD: varargs.h,v 1.4 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: varargs.h,v 1.1 1996/09/30 16:34:37 ws Exp $ */
/*-
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/powerpc/include/vuid_event.h b/sys/arch/powerpc/include/vuid_event.h
index 21576cf8e26..f662dd5e944 100644
--- a/sys/arch/powerpc/include/vuid_event.h
+++ b/sys/arch/powerpc/include/vuid_event.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vuid_event.h,v 1.1 1998/09/27 03:55:57 rahnds Exp $ */
+/* $OpenBSD: vuid_event.h,v 1.2 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: vuid_event.h,v 1.1 1996/04/12 01:45:47 cgd Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/powerpc/powerpc/bcopy.c b/sys/arch/powerpc/powerpc/bcopy.c
index 8af73260f57..cf5e192a562 100644
--- a/sys/arch/powerpc/powerpc/bcopy.c
+++ b/sys/arch/powerpc/powerpc/bcopy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcopy.c,v 1.3 2001/06/24 04:56:07 drahn Exp $ */
+/* $OpenBSD: bcopy.c,v 1.4 2003/06/02 23:27:53 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,7 +33,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)bcopy.c 5.11 (Berkeley) 6/21/91";*/
-static char *rcsid = "$Id: bcopy.c,v 1.3 2001/06/24 04:56:07 drahn Exp $";
+static char *rcsid = "$Id: bcopy.c,v 1.4 2003/06/02 23:27:53 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
diff --git a/sys/arch/sparc/dev/amd7930var.h b/sys/arch/sparc/dev/amd7930var.h
index 77381c88d73..bd73abde6d5 100644
--- a/sys/arch/sparc/dev/amd7930var.h
+++ b/sys/arch/sparc/dev/amd7930var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: amd7930var.h,v 1.5 1999/05/28 21:54:23 jason Exp $ */
+/* $OpenBSD: amd7930var.h,v 1.6 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: amd7930var.h,v 1.3 1996/02/01 22:32:25 mycroft Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/bt_subr.c b/sys/arch/sparc/dev/bt_subr.c
index d877f690900..2ad944851dc 100644
--- a/sys/arch/sparc/dev/bt_subr.c
+++ b/sys/arch/sparc/dev/bt_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bt_subr.c,v 1.8 2002/08/12 10:44:03 miod Exp $ */
+/* $OpenBSD: bt_subr.c,v 1.9 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: bt_subr.c,v 1.5 1996/03/14 19:44:32 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/btreg.h b/sys/arch/sparc/dev/btreg.h
index e146117c25b..395e23747f1 100644
--- a/sys/arch/sparc/dev/btreg.h
+++ b/sys/arch/sparc/dev/btreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: btreg.h,v 1.3 1997/08/08 08:24:40 downsj Exp $ */
+/* $OpenBSD: btreg.h,v 1.4 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: btreg.h,v 1.4 1996/02/27 22:09:21 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/btvar.h b/sys/arch/sparc/dev/btvar.h
index 1cbbaf9b2e6..66c321bccb0 100644
--- a/sys/arch/sparc/dev/btvar.h
+++ b/sys/arch/sparc/dev/btvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: btvar.h,v 1.4 2002/08/12 10:44:03 miod Exp $ */
+/* $OpenBSD: btvar.h,v 1.5 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: btvar.h,v 1.2 1994/11/20 20:51:56 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/bwtwo.c b/sys/arch/sparc/dev/bwtwo.c
index 30f1a1331c2..ce114473c6c 100644
--- a/sys/arch/sparc/dev/bwtwo.c
+++ b/sys/arch/sparc/dev/bwtwo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwtwo.c,v 1.25 2002/11/06 21:06:20 miod Exp $ */
+/* $OpenBSD: bwtwo.c,v 1.26 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: bwtwo.c,v 1.33 1997/05/24 20:16:02 pk Exp $ */
/*
@@ -24,11 +24,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/bwtworeg.h b/sys/arch/sparc/dev/bwtworeg.h
index f773d3c237e..c2c9780ad85 100644
--- a/sys/arch/sparc/dev/bwtworeg.h
+++ b/sys/arch/sparc/dev/bwtworeg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwtworeg.h,v 1.3 1997/08/08 08:24:43 downsj Exp $ */
+/* $OpenBSD: bwtworeg.h,v 1.4 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: bwtworeg.h,v 1.3 1996/02/27 00:32:39 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/cgeight.c b/sys/arch/sparc/dev/cgeight.c
index a9fa9dacad8..73523787df3 100644
--- a/sys/arch/sparc/dev/cgeight.c
+++ b/sys/arch/sparc/dev/cgeight.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgeight.c,v 1.19 2003/05/12 20:18:39 jason Exp $ */
+/* $OpenBSD: cgeight.c,v 1.20 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: cgeight.c,v 1.13 1997/05/24 20:16:04 pk Exp $ */
/*
@@ -25,11 +25,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/cgfour.c b/sys/arch/sparc/dev/cgfour.c
index ee19dfc5066..f171591813a 100644
--- a/sys/arch/sparc/dev/cgfour.c
+++ b/sys/arch/sparc/dev/cgfour.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgfour.c,v 1.18 2003/05/12 20:18:39 jason Exp $ */
+/* $OpenBSD: cgfour.c,v 1.19 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: cgfour.c,v 1.13 1997/05/24 20:16:06 pk Exp $ */
/*
@@ -29,11 +29,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/cgsix.c b/sys/arch/sparc/dev/cgsix.c
index dcfb4821009..70a6225f81c 100644
--- a/sys/arch/sparc/dev/cgsix.c
+++ b/sys/arch/sparc/dev/cgsix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgsix.c,v 1.25 2003/06/02 18:40:59 jason Exp $ */
+/* $OpenBSD: cgsix.c,v 1.26 2003/06/02 23:27:53 millert Exp $ */
/* $NetBSD: cgsix.c,v 1.33 1997/08/07 19:12:30 pk Exp $ */
/*
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/cgsixreg.h b/sys/arch/sparc/dev/cgsixreg.h
index 12ce15f1287..954421b5bd5 100644
--- a/sys/arch/sparc/dev/cgsixreg.h
+++ b/sys/arch/sparc/dev/cgsixreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgsixreg.h,v 1.5 2003/06/02 18:40:59 jason Exp $ */
+/* $OpenBSD: cgsixreg.h,v 1.6 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: cgsixreg.h,v 1.4 1996/02/27 22:09:31 thorpej Exp $ */
/*
@@ -47,11 +47,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/cgthree.c b/sys/arch/sparc/dev/cgthree.c
index e4185f9ba06..e6c409338aa 100644
--- a/sys/arch/sparc/dev/cgthree.c
+++ b/sys/arch/sparc/dev/cgthree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgthree.c,v 1.20 2003/06/02 18:40:59 jason Exp $ */
+/* $OpenBSD: cgthree.c,v 1.21 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: cgthree.c,v 1.33 1997/05/24 20:16:11 pk Exp $ */
/*
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/cgthreereg.h b/sys/arch/sparc/dev/cgthreereg.h
index 89811921252..0e3274a11c0 100644
--- a/sys/arch/sparc/dev/cgthreereg.h
+++ b/sys/arch/sparc/dev/cgthreereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgthreereg.h,v 1.3 1997/08/08 08:24:54 downsj Exp $ */
+/* $OpenBSD: cgthreereg.h,v 1.4 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: cgthreereg.h,v 1.5 1996/02/27 00:14:17 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/cgtwo.c b/sys/arch/sparc/dev/cgtwo.c
index 6597bd9ae5b..a3945e79498 100644
--- a/sys/arch/sparc/dev/cgtwo.c
+++ b/sys/arch/sparc/dev/cgtwo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgtwo.c,v 1.26 2003/05/12 20:18:39 jason Exp $ */
+/* $OpenBSD: cgtwo.c,v 1.27 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: cgtwo.c,v 1.22 1997/05/24 20:16:12 pk Exp $ */
/*
@@ -46,11 +46,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/fb.c b/sys/arch/sparc/dev/fb.c
index e01eb66f149..be3fe45602d 100644
--- a/sys/arch/sparc/dev/fb.c
+++ b/sys/arch/sparc/dev/fb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fb.c,v 1.23 2002/11/24 00:36:16 miod Exp $ */
+/* $OpenBSD: fb.c,v 1.24 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fb.c,v 1.23 1997/07/07 23:30:22 pk Exp $ */
/*
@@ -47,11 +47,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 9e90147cad4..a53c99ab86b 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.32 2002/11/24 18:17:58 miod Exp $ */
+/* $OpenBSD: fd.c,v 1.33 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */
/*-
@@ -24,11 +24,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/fdreg.h b/sys/arch/sparc/dev/fdreg.h
index bbe97ecb7c4..3cf4138c1bb 100644
--- a/sys/arch/sparc/dev/fdreg.h
+++ b/sys/arch/sparc/dev/fdreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fdreg.h,v 1.3 1997/06/24 09:50:57 downsj Exp $ */
+/* $OpenBSD: fdreg.h,v 1.4 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fdreg.h,v 1.6 1997/05/02 13:03:44 pk Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/if_lereg.h b/sys/arch/sparc/dev/if_lereg.h
index 8302ec41359..ce4a71e2895 100644
--- a/sys/arch/sparc/dev/if_lereg.h
+++ b/sys/arch/sparc/dev/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.4 1998/12/02 07:34:34 deraadt Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.5 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: if_lereg.h,v 1.5 1995/12/10 10:15:07 mycroft Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/if_levar.h b/sys/arch/sparc/dev/if_levar.h
index b64b3a1dc67..29845e08650 100644
--- a/sys/arch/sparc/dev/if_levar.h
+++ b/sys/arch/sparc/dev/if_levar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_levar.h,v 1.4 1998/09/19 15:11:51 jason Exp $ */
+/* $OpenBSD: if_levar.h,v 1.5 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: if_levar.h,v 1.7 1997/04/04 20:29:23 pk Exp $ */
/*-
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c
index 294ffff2009..c86c9d74ac3 100644
--- a/sys/arch/sparc/dev/sbus.c
+++ b/sys/arch/sparc/dev/sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbus.c,v 1.11 2002/03/14 01:26:43 millert Exp $ */
+/* $OpenBSD: sbus.c,v 1.12 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: sbus.c,v 1.17 1997/06/01 22:10:39 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/sbusreg.h b/sys/arch/sparc/dev/sbusreg.h
index 25e630e4862..3a6cef35a4e 100644
--- a/sys/arch/sparc/dev/sbusreg.h
+++ b/sys/arch/sparc/dev/sbusreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbusreg.h,v 1.3 1997/09/17 06:47:11 downsj Exp $ */
+/* $OpenBSD: sbusreg.h,v 1.4 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: sbusreg.h,v 1.3 1997/09/14 19:17:25 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/sbusvar.h b/sys/arch/sparc/dev/sbusvar.h
index e43cc3e35e0..0cc849d92f8 100644
--- a/sys/arch/sparc/dev/sbusvar.h
+++ b/sys/arch/sparc/dev/sbusvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbusvar.h,v 1.6 2002/03/14 01:26:43 millert Exp $ */
+/* $OpenBSD: sbusvar.h,v 1.7 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: sbusvar.h,v 1.4 1996/04/22 02:35:05 abrown Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/z8530kbd.c b/sys/arch/sparc/dev/z8530kbd.c
index 1e5e723c611..72eb74283e4 100644
--- a/sys/arch/sparc/dev/z8530kbd.c
+++ b/sys/arch/sparc/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530kbd.c,v 1.3 2003/03/09 01:43:44 miod Exp $ */
+/* $OpenBSD: z8530kbd.c,v 1.4 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -53,11 +53,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/z8530reg.h b/sys/arch/sparc/dev/z8530reg.h
index eff0a069d89..c2fa29f2116 100644
--- a/sys/arch/sparc/dev/z8530reg.h
+++ b/sys/arch/sparc/dev/z8530reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530reg.h,v 1.1 2002/08/12 10:44:04 miod Exp $ */
+/* $OpenBSD: z8530reg.h,v 1.2 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: z8530reg.h,v 1.9 1998/07/31 05:08:38 wrstuden Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/z8530sc.c b/sys/arch/sparc/dev/z8530sc.c
index f14286f32f9..e5afc853816 100644
--- a/sys/arch/sparc/dev/z8530sc.c
+++ b/sys/arch/sparc/dev/z8530sc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530sc.c,v 1.1 2002/08/12 10:44:04 miod Exp $ */
+/* $OpenBSD: z8530sc.c,v 1.2 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: z8530sc.c,v 1.4 1996/05/17 19:30:34 gwr Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/z8530sc.h b/sys/arch/sparc/dev/z8530sc.h
index e9f22245707..623a46e84b9 100644
--- a/sys/arch/sparc/dev/z8530sc.h
+++ b/sys/arch/sparc/dev/z8530sc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530sc.h,v 1.1 2002/08/12 10:44:04 miod Exp $ */
+/* $OpenBSD: z8530sc.h,v 1.2 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: z8530sc.h,v 1.15 2001/05/11 01:40:48 thorpej Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/dev/z8530tty.c b/sys/arch/sparc/dev/z8530tty.c
index 642fc05cae5..038d8b42ad2 100644
--- a/sys/arch/sparc/dev/z8530tty.c
+++ b/sys/arch/sparc/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530tty.c,v 1.1 2002/08/12 10:44:04 miod Exp $ */
+/* $OpenBSD: z8530tty.c,v 1.2 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $ */
/*-
@@ -53,11 +53,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu.c b/sys/arch/sparc/fpu/fpu.c
index e71a5e0868e..c9989b399ed 100644
--- a/sys/arch/sparc/fpu/fpu.c
+++ b/sys/arch/sparc/fpu/fpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu.c,v 1.10 2001/09/10 16:34:49 jason Exp $ */
+/* $OpenBSD: fpu.c,v 1.11 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu.c,v 1.6 1997/07/29 10:09:51 fair Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_add.c b/sys/arch/sparc/fpu/fpu_add.c
index 28ee40b9370..5db0a1a7db6 100644
--- a/sys/arch/sparc/fpu/fpu_add.c
+++ b/sys/arch/sparc/fpu/fpu_add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_add.c,v 1.3 1997/08/08 08:25:47 downsj Exp $ */
+/* $OpenBSD: fpu_add.c,v 1.4 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_arith.h b/sys/arch/sparc/fpu/fpu_arith.h
index d222eae3a39..352478d39c5 100644
--- a/sys/arch/sparc/fpu/fpu_arith.h
+++ b/sys/arch/sparc/fpu/fpu_arith.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_arith.h,v 1.2 1997/08/08 08:25:48 downsj Exp $ */
+/* $OpenBSD: fpu_arith.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_arith.h,v 1.2 1994/11/20 20:52:35 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_compare.c b/sys/arch/sparc/fpu/fpu_compare.c
index 642b5497d70..8ce87f18879 100644
--- a/sys/arch/sparc/fpu/fpu_compare.c
+++ b/sys/arch/sparc/fpu/fpu_compare.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_compare.c,v 1.2 1997/08/08 08:25:49 downsj Exp $ */
+/* $OpenBSD: fpu_compare.c,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_compare.c,v 1.2 1994/11/20 20:52:37 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_div.c b/sys/arch/sparc/fpu/fpu_div.c
index 366844ec578..5afae751aa1 100644
--- a/sys/arch/sparc/fpu/fpu_div.c
+++ b/sys/arch/sparc/fpu/fpu_div.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_div.c,v 1.2 1997/08/08 08:25:50 downsj Exp $ */
+/* $OpenBSD: fpu_div.c,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_emu.h b/sys/arch/sparc/fpu/fpu_emu.h
index 78f4dc69292..57252854825 100644
--- a/sys/arch/sparc/fpu/fpu_emu.h
+++ b/sys/arch/sparc/fpu/fpu_emu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_emu.h,v 1.2 1997/08/08 08:25:51 downsj Exp $ */
+/* $OpenBSD: fpu_emu.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_emu.h,v 1.2 1994/11/20 20:52:39 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_explode.c b/sys/arch/sparc/fpu/fpu_explode.c
index 658ecdaf88b..5949fc83e75 100644
--- a/sys/arch/sparc/fpu/fpu_explode.c
+++ b/sys/arch/sparc/fpu/fpu_explode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_explode.c,v 1.3 1997/08/08 08:25:52 downsj Exp $ */
+/* $OpenBSD: fpu_explode.c,v 1.4 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_explode.c,v 1.3 1996/03/14 19:41:54 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_implode.c b/sys/arch/sparc/fpu/fpu_implode.c
index b3eca3edc0d..6201e370088 100644
--- a/sys/arch/sparc/fpu/fpu_implode.c
+++ b/sys/arch/sparc/fpu/fpu_implode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_implode.c,v 1.4 2002/03/14 01:26:43 millert Exp $ */
+/* $OpenBSD: fpu_implode.c,v 1.5 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_implode.c,v 1.3 1996/03/14 19:41:59 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_mul.c b/sys/arch/sparc/fpu/fpu_mul.c
index 241b0211b02..8242e1532ca 100644
--- a/sys/arch/sparc/fpu/fpu_mul.c
+++ b/sys/arch/sparc/fpu/fpu_mul.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_mul.c,v 1.2 1997/08/08 08:25:57 downsj Exp $ */
+/* $OpenBSD: fpu_mul.c,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_sqrt.c b/sys/arch/sparc/fpu/fpu_sqrt.c
index e603226fc35..53a786e623a 100644
--- a/sys/arch/sparc/fpu/fpu_sqrt.c
+++ b/sys/arch/sparc/fpu/fpu_sqrt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_sqrt.c,v 1.2 1997/08/08 08:25:58 downsj Exp $ */
+/* $OpenBSD: fpu_sqrt.c,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/fpu/fpu_subr.c b/sys/arch/sparc/fpu/fpu_subr.c
index d1b5e17e53a..6bc21b77ba1 100644
--- a/sys/arch/sparc/fpu/fpu_subr.c
+++ b/sys/arch/sparc/fpu/fpu_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_subr.c,v 1.3 1997/08/08 08:25:59 downsj Exp $ */
+/* $OpenBSD: fpu_subr.c,v 1.4 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/ansi.h b/sys/arch/sparc/include/ansi.h
index 078e3e270e4..a460cb30c1e 100644
--- a/sys/arch/sparc/include/ansi.h
+++ b/sys/arch/sparc/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.7 2000/02/22 17:29:14 millert Exp $ */
+/* $OpenBSD: ansi.h,v 1.8 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: ansi.h,v 1.6 1996/11/15 22:38:59 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/autoconf.h b/sys/arch/sparc/include/autoconf.h
index 525403a986a..35865505f8c 100644
--- a/sys/arch/sparc/include/autoconf.h
+++ b/sys/arch/sparc/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.h,v 1.11 2002/03/15 01:20:04 millert Exp $ */
+/* $OpenBSD: autoconf.h,v 1.12 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: autoconf.h,v 1.20 1997/05/24 20:03:03 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/bsd_openprom.h b/sys/arch/sparc/include/bsd_openprom.h
index b7b89d9078c..3f0f0b85e6b 100644
--- a/sys/arch/sparc/include/bsd_openprom.h
+++ b/sys/arch/sparc/include/bsd_openprom.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bsd_openprom.h,v 1.9 2002/03/14 01:26:43 millert Exp $ */
+/* $OpenBSD: bsd_openprom.h,v 1.10 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: bsd_openprom.h,v 1.11 1996/05/18 12:27:43 mrg Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index 13bd4e05c00..a958a69c803 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.19 2002/11/22 23:08:46 deraadt Exp $ */
+/* $OpenBSD: cpu.h,v 1.20 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/ctlreg.h b/sys/arch/sparc/include/ctlreg.h
index f0afd84eed5..2b881c053b1 100644
--- a/sys/arch/sparc/include/ctlreg.h
+++ b/sys/arch/sparc/include/ctlreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctlreg.h,v 1.6 2000/02/18 16:12:26 art Exp $ */
+/* $OpenBSD: ctlreg.h,v 1.7 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: ctlreg.h,v 1.15 1997/07/20 18:55:03 pk Exp $ */
/*
@@ -25,11 +25,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/fbvar.h b/sys/arch/sparc/include/fbvar.h
index 963e9d8403f..c9f3046fb98 100644
--- a/sys/arch/sparc/include/fbvar.h
+++ b/sys/arch/sparc/include/fbvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fbvar.h,v 1.9 2003/05/14 01:51:03 fgsch Exp $ */
+/* $OpenBSD: fbvar.h,v 1.10 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fbvar.h,v 1.9 1997/07/07 23:31:30 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/float.h b/sys/arch/sparc/include/float.h
index e6c33429deb..786302745be 100644
--- a/sys/arch/sparc/include/float.h
+++ b/sys/arch/sparc/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.4 2002/03/14 01:26:43 millert Exp $ */
+/* $OpenBSD: float.h,v 1.5 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: float.h,v 1.6 1997/07/18 05:11:52 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/frame.h b/sys/arch/sparc/include/frame.h
index 8313eacf8b6..32c7e1523a3 100644
--- a/sys/arch/sparc/include/frame.h
+++ b/sys/arch/sparc/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.2 1997/08/08 08:26:20 downsj Exp $ */
+/* $OpenBSD: frame.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: frame.h,v 1.2 1994/11/20 20:53:07 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/fsr.h b/sys/arch/sparc/include/fsr.h
index 37688a35173..4bcc7874c62 100644
--- a/sys/arch/sparc/include/fsr.h
+++ b/sys/arch/sparc/include/fsr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsr.h,v 1.2 1997/08/08 08:26:21 downsj Exp $ */
+/* $OpenBSD: fsr.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: fsr.h,v 1.2 1994/11/20 20:53:08 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/ieee.h b/sys/arch/sparc/include/ieee.h
index d8a2509f540..a66c9cc6f8c 100644
--- a/sys/arch/sparc/include/ieee.h
+++ b/sys/arch/sparc/include/ieee.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee.h,v 1.2 1997/08/08 08:26:24 downsj Exp $ */
+/* $OpenBSD: ieee.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: ieee.h,v 1.2 1994/11/20 20:53:10 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/instr.h b/sys/arch/sparc/include/instr.h
index d4b002445f3..1c855d24e99 100644
--- a/sys/arch/sparc/include/instr.h
+++ b/sys/arch/sparc/include/instr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: instr.h,v 1.2 1997/08/08 08:26:26 downsj Exp $ */
+/* $OpenBSD: instr.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: instr.h,v 1.3 1997/03/14 23:54:07 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/limits.h b/sys/arch/sparc/include/limits.h
index 4bfbd5ba62a..1b015fb0589 100644
--- a/sys/arch/sparc/include/limits.h
+++ b/sys/arch/sparc/include/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.8 2002/07/30 01:22:00 millert Exp $ */
+/* $OpenBSD: limits.h,v 1.9 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: limits.h,v 1.7 1996/01/05 18:10:57 pk Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/openpromio.h b/sys/arch/sparc/include/openpromio.h
index fb50a2b8268..5a0de304f94 100644
--- a/sys/arch/sparc/include/openpromio.h
+++ b/sys/arch/sparc/include/openpromio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: openpromio.h,v 1.2 1997/08/08 08:26:35 downsj Exp $ */
+/* $OpenBSD: openpromio.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: openpromio.h,v 1.2 1994/11/20 20:53:17 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h
index e9cab79c58e..aa1a6632e76 100644
--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.26 2002/03/15 00:06:08 miod Exp $ */
+/* $OpenBSD: param.h,v 1.27 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: param.h,v 1.29 1997/03/10 22:50:37 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/pcb.h b/sys/arch/sparc/include/pcb.h
index 1383098c8d3..dadf7f626bb 100644
--- a/sys/arch/sparc/include/pcb.h
+++ b/sys/arch/sparc/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.4 2002/02/20 22:28:21 deraadt Exp $ */
+/* $OpenBSD: pcb.h,v 1.5 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: pcb.h,v 1.4 1995/03/28 18:19:56 jtc Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/proc.h b/sys/arch/sparc/include/proc.h
index dc4b3629af1..68217bc4bf2 100644
--- a/sys/arch/sparc/include/proc.h
+++ b/sys/arch/sparc/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.2 1997/08/08 08:26:39 downsj Exp $ */
+/* $OpenBSD: proc.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: proc.h,v 1.3 1996/09/26 18:51:17 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/profile.h b/sys/arch/sparc/include/profile.h
index 3cc3c389fec..972b8d476f5 100644
--- a/sys/arch/sparc/include/profile.h
+++ b/sys/arch/sparc/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.7 2002/08/11 12:13:16 art Exp $ */
+/* $OpenBSD: profile.h,v 1.8 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: profile.h,v 1.8 1997/02/01 20:56:40 mrg Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/psl.h b/sys/arch/sparc/include/psl.h
index 2e01768bfc6..6bb6785e66b 100644
--- a/sys/arch/sparc/include/psl.h
+++ b/sys/arch/sparc/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.17 2002/12/11 06:56:21 art Exp $ */
+/* $OpenBSD: psl.h,v 1.18 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: psl.h,v 1.12 1997/03/10 21:49:11 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/ptrace.h b/sys/arch/sparc/include/ptrace.h
index 7cc86b633b4..3928caf8c75 100644
--- a/sys/arch/sparc/include/ptrace.h
+++ b/sys/arch/sparc/include/ptrace.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ptrace.h,v 1.3 2002/02/20 22:28:21 deraadt Exp $ */
+/* $OpenBSD: ptrace.h,v 1.4 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: ptrace.h,v 1.4 1994/11/20 20:53:27 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/reg.h b/sys/arch/sparc/include/reg.h
index ac6a9933849..b49e333f683 100644
--- a/sys/arch/sparc/include/reg.h
+++ b/sys/arch/sparc/include/reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reg.h,v 1.2 1997/08/08 08:26:44 downsj Exp $ */
+/* $OpenBSD: reg.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: reg.h,v 1.4 1994/11/20 20:53:28 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/reloc.h b/sys/arch/sparc/include/reloc.h
index b49b7c8a17f..c9152936d8b 100644
--- a/sys/arch/sparc/include/reloc.h
+++ b/sys/arch/sparc/include/reloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reloc.h,v 1.2 1997/08/08 08:26:45 downsj Exp $ */
+/* $OpenBSD: reloc.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: reloc.h,v 1.2 1994/11/20 20:53:30 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/remote-sl.h b/sys/arch/sparc/include/remote-sl.h
index 76498e57e87..5a8dcc94b10 100644
--- a/sys/arch/sparc/include/remote-sl.h
+++ b/sys/arch/sparc/include/remote-sl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: remote-sl.h,v 1.2 1997/08/08 08:26:47 downsj Exp $ */
+/* $OpenBSD: remote-sl.h,v 1.3 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: remote-sl.h,v 1.2 1994/11/20 20:53:31 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/signal.h b/sys/arch/sparc/include/signal.h
index 7b575c569ef..21078210493 100644
--- a/sys/arch/sparc/include/signal.h
+++ b/sys/arch/sparc/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.3 1997/08/08 08:26:48 downsj Exp $ */
+/* $OpenBSD: signal.h,v 1.4 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: signal.h,v 1.4 1996/02/01 22:32:35 mycroft Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/stdarg.h b/sys/arch/sparc/include/stdarg.h
index 8647edb1fc8..62e0aa3ccf6 100644
--- a/sys/arch/sparc/include/stdarg.h
+++ b/sys/arch/sparc/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.5 2002/10/23 15:38:16 millert Exp $ */
+/* $OpenBSD: stdarg.h,v 1.6 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: stdarg.h,v 1.10 1996/12/27 20:55:28 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/sun_disklabel.h b/sys/arch/sparc/include/sun_disklabel.h
index 234051e21ed..f18705d9cf6 100644
--- a/sys/arch/sparc/include/sun_disklabel.h
+++ b/sys/arch/sparc/include/sun_disklabel.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sun_disklabel.h,v 1.8 2002/03/14 01:26:44 millert Exp $ */
+/* $OpenBSD: sun_disklabel.h,v 1.9 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: sun_disklabel.h,v 1.6 1996/01/07 22:03:09 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/trap.h b/sys/arch/sparc/include/trap.h
index 793e3b2724e..fcf25b4102e 100644
--- a/sys/arch/sparc/include/trap.h
+++ b/sys/arch/sparc/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.4 1997/08/08 08:26:51 downsj Exp $ */
+/* $OpenBSD: trap.h,v 1.5 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: trap.h,v 1.9 1996/05/16 15:57:04 abrown Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/types.h b/sys/arch/sparc/include/types.h
index c6df2fc3c4c..affe9230a4f 100644
--- a/sys/arch/sparc/include/types.h
+++ b/sys/arch/sparc/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.13 2003/01/13 06:08:08 art Exp $ */
+/* $OpenBSD: types.h,v 1.14 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: types.h,v 1.11 1996/12/10 23:19:38 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/varargs.h b/sys/arch/sparc/include/varargs.h
index 68ed7800c9b..af33ab0d83e 100644
--- a/sys/arch/sparc/include/varargs.h
+++ b/sys/arch/sparc/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.5 1997/08/08 08:26:53 downsj Exp $ */
+/* $OpenBSD: varargs.h,v 1.6 2003/06/02 23:27:54 millert Exp $ */
/* $NetBSD: varargs.h,v 1.10 1995/12/29 18:53:02 mycroft Exp $ */
/*
@@ -27,11 +27,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h
index 4d73d51d387..09f04c06cb7 100644
--- a/sys/arch/sparc/include/vmparam.h
+++ b/sys/arch/sparc/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.27 2002/10/28 19:30:21 art Exp $ */
+/* $OpenBSD: vmparam.h,v 1.28 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/include/z8530var.h b/sys/arch/sparc/include/z8530var.h
index 9969389c57a..1568cf957c3 100644
--- a/sys/arch/sparc/include/z8530var.h
+++ b/sys/arch/sparc/include/z8530var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530var.h,v 1.1 2002/08/12 10:44:04 miod Exp $ */
+/* $OpenBSD: z8530var.h,v 1.2 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: z8530var.h,v 1.1 1997/10/18 00:01:30 gwr Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/amd7930intr.s b/sys/arch/sparc/sparc/amd7930intr.s
index 91d61b30712..b3ed77fb088 100644
--- a/sys/arch/sparc/sparc/amd7930intr.s
+++ b/sys/arch/sparc/sparc/amd7930intr.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: amd7930intr.s,v 1.7 2002/08/11 12:14:39 art Exp $ */
+/* $OpenBSD: amd7930intr.s,v 1.8 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: amd7930intr.s,v 1.10 1997/03/11 01:03:07 pk Exp $ */
/*
* Copyright (c) 1995 Rolf Grossmann.
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/asm.h b/sys/arch/sparc/sparc/asm.h
index d6972b91fac..06efbef5320 100644
--- a/sys/arch/sparc/sparc/asm.h
+++ b/sys/arch/sparc/sparc/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.4 2000/02/17 21:33:47 art Exp $ */
+/* $OpenBSD: asm.h,v 1.5 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: asm.h,v 1.4 1996/07/01 18:01:26 abrown Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index c1030ec6c70..cdad86e3e42 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.57 2003/05/13 22:25:33 miod Exp $ */
+/* $OpenBSD: autoconf.c,v 1.58 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */
/*
@@ -25,11 +25,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/auxioreg.h b/sys/arch/sparc/sparc/auxioreg.h
index f0b6207892d..ad8223c325b 100644
--- a/sys/arch/sparc/sparc/auxioreg.h
+++ b/sys/arch/sparc/sparc/auxioreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: auxioreg.h,v 1.3 2003/05/13 22:25:33 miod Exp $ */
+/* $OpenBSD: auxioreg.h,v 1.4 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: auxreg.h,v 1.7 1997/05/17 17:52:52 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/auxreg.c b/sys/arch/sparc/sparc/auxreg.c
index 907a9be6312..c3d12d0a62d 100644
--- a/sys/arch/sparc/sparc/auxreg.c
+++ b/sys/arch/sparc/sparc/auxreg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auxreg.c,v 1.10 2003/05/13 22:25:33 miod Exp $ */
+/* $OpenBSD: auxreg.c,v 1.11 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: auxreg.c,v 1.21 1997/05/24 20:15:59 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/clockreg.h b/sys/arch/sparc/sparc/clockreg.h
index a1769a69d6d..1df8b8bb3b9 100644
--- a/sys/arch/sparc/sparc/clockreg.h
+++ b/sys/arch/sparc/sparc/clockreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clockreg.h,v 1.2 1997/08/08 08:27:07 downsj Exp $ */
+/* $OpenBSD: clockreg.h,v 1.3 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: clockreg.h,v 1.5 1994/11/20 20:54:07 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index dee3953b7ed..139c819477a 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.37 2003/05/14 00:20:37 tedu Exp $ */
+/* $OpenBSD: conf.c,v 1.38 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/genassym.cf b/sys/arch/sparc/sparc/genassym.cf
index d6ffa742f83..3281b9e502d 100644
--- a/sys/arch/sparc/sparc/genassym.cf
+++ b/sys/arch/sparc/sparc/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.13 2003/05/15 02:39:16 miod Exp $
+# $OpenBSD: genassym.cf,v 1.14 2003/06/02 23:27:55 millert Exp $
# $NetBSD: genassym.cf,v 1.2 1997/06/28 19:59:04 pk Exp $
#
@@ -23,11 +23,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/sparc/sparc/in_cksum.c b/sys/arch/sparc/sparc/in_cksum.c
index a6e0a86371a..bbf512bd85c 100644
--- a/sys/arch/sparc/sparc/in_cksum.c
+++ b/sys/arch/sparc/sparc/in_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_cksum.c,v 1.8 1997/08/08 08:27:15 downsj Exp $ */
+/* $OpenBSD: in_cksum.c,v 1.9 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: in_cksum.c,v 1.7 1996/10/05 23:44:34 mrg Exp $ */
/*
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c
index ecc40196a8b..cbf57ad643b 100644
--- a/sys/arch/sparc/sparc/intr.c
+++ b/sys/arch/sparc/sparc/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.23 2002/12/10 23:43:48 miod Exp $ */
+/* $OpenBSD: intr.c,v 1.24 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: intr.c,v 1.20 1997/07/29 09:42:03 fair Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/intreg.h b/sys/arch/sparc/sparc/intreg.h
index 7b9fe8661d9..8a8915d36ec 100644
--- a/sys/arch/sparc/sparc/intreg.h
+++ b/sys/arch/sparc/sparc/intreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intreg.h,v 1.5 2002/03/14 01:26:44 millert Exp $ */
+/* $OpenBSD: intreg.h,v 1.6 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: intreg.h,v 1.6 1997/07/22 20:19:10 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/kgdb_machdep.c b/sys/arch/sparc/sparc/kgdb_machdep.c
index d54fb6e6d1c..562dbf571e3 100644
--- a/sys/arch/sparc/sparc/kgdb_machdep.c
+++ b/sys/arch/sparc/sparc/kgdb_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kgdb_machdep.c,v 1.6 2003/01/09 02:24:52 art Exp $ */
+/* $OpenBSD: kgdb_machdep.c,v 1.7 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: kgdb_machdep.c,v 1.1 1997/08/31 21:22:45 pk Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -61,11 +61,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/kgdb_proto.h b/sys/arch/sparc/sparc/kgdb_proto.h
index bc2c777ddea..5eeaa46bb22 100644
--- a/sys/arch/sparc/sparc/kgdb_proto.h
+++ b/sys/arch/sparc/sparc/kgdb_proto.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kgdb_proto.h,v 1.3 1997/08/08 08:27:23 downsj Exp $ */
+/* $OpenBSD: kgdb_proto.h,v 1.4 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: kgdb_proto.h,v 1.4 1996/05/16 15:57:19 abrown Exp $ */
/*
@@ -26,11 +26,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/locore2.c b/sys/arch/sparc/sparc/locore2.c
index 75299008f41..f2b90ed0e4a 100644
--- a/sys/arch/sparc/sparc/locore2.c
+++ b/sys/arch/sparc/sparc/locore2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore2.c,v 1.4 1997/08/08 08:27:29 downsj Exp $ */
+/* $OpenBSD: locore2.c,v 1.5 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: locore2.c,v 1.7 1996/11/06 20:19:53 cgd Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index e1437869dba..6989366d264 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.92 2003/06/02 00:01:27 art Exp $ */
+/* $OpenBSD: machdep.c,v 1.93 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/mem.c b/sys/arch/sparc/sparc/mem.c
index 3dc66f0f3b2..b32429a73e8 100644
--- a/sys/arch/sparc/sparc/mem.c
+++ b/sys/arch/sparc/sparc/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.20 2001/12/08 02:24:07 art Exp $ */
+/* $OpenBSD: mem.c,v 1.21 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: mem.c,v 1.13 1996/03/30 21:12:16 christos Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/memreg.h b/sys/arch/sparc/sparc/memreg.h
index 2841a1eb0a4..1ad6e75f57e 100644
--- a/sys/arch/sparc/sparc/memreg.h
+++ b/sys/arch/sparc/sparc/memreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: memreg.h,v 1.7 2003/05/13 22:25:33 miod Exp $ */
+/* $OpenBSD: memreg.h,v 1.8 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: memreg.h,v 1.4 1996/03/31 22:52:13 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/openprom.c b/sys/arch/sparc/sparc/openprom.c
index 70a413344ca..1aa16d4ce30 100644
--- a/sys/arch/sparc/sparc/openprom.c
+++ b/sys/arch/sparc/sparc/openprom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openprom.c,v 1.4 2002/03/14 01:26:44 millert Exp $ */
+/* $OpenBSD: openprom.c,v 1.5 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: openprom.c,v 1.8 1996/03/31 23:45:34 pk Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/process_machdep.c b/sys/arch/sparc/sparc/process_machdep.c
index 9fde6799301..7c1cb4e569d 100644
--- a/sys/arch/sparc/sparc/process_machdep.c
+++ b/sys/arch/sparc/sparc/process_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process_machdep.c,v 1.5 2002/03/14 00:42:24 miod Exp $ */
+/* $OpenBSD: process_machdep.c,v 1.6 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: process_machdep.c,v 1.6 1996/03/14 21:09:26 christos Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/sys_machdep.c b/sys/arch/sparc/sparc/sys_machdep.c
index 37a6938a0cf..93649bec25b 100644
--- a/sys/arch/sparc/sparc/sys_machdep.c
+++ b/sys/arch/sparc/sparc/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.5 2000/06/23 02:14:37 mickey Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.6 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: sys_machdep.c,v 1.7 1996/03/14 21:09:33 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/sparc/timerreg.h b/sys/arch/sparc/sparc/timerreg.h
index b6f41dcf1f3..78241c9a53e 100644
--- a/sys/arch/sparc/sparc/timerreg.h
+++ b/sys/arch/sparc/sparc/timerreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: timerreg.h,v 1.3 1997/08/08 08:27:44 downsj Exp $ */
+/* $OpenBSD: timerreg.h,v 1.4 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: timerreg.h,v 1.6 1996/10/28 00:20:32 abrown Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/stand/boot/boot.c b/sys/arch/sparc/stand/boot/boot.c
index cde1a0bda70..c760ecd42cb 100644
--- a/sys/arch/sparc/stand/boot/boot.c
+++ b/sys/arch/sparc/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.4 2002/08/11 23:11:22 art Exp $ */
+/* $OpenBSD: boot.c,v 1.5 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: boot.c,v 1.2 1997/09/14 19:27:21 pk Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc/stand/boot/loadfile.c b/sys/arch/sparc/stand/boot/loadfile.c
index 2853554cb94..f9532b12707 100644
--- a/sys/arch/sparc/stand/boot/loadfile.c
+++ b/sys/arch/sparc/stand/boot/loadfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: loadfile.c,v 1.3 2003/04/08 20:34:01 miod Exp $ */
+/* $OpenBSD: loadfile.c,v 1.4 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: loadfile.c,v 1.3 1997/04/06 08:40:59 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/dev/iommureg.h b/sys/arch/sparc64/dev/iommureg.h
index 07f53188cbc..b46a9263ce5 100644
--- a/sys/arch/sparc64/dev/iommureg.h
+++ b/sys/arch/sparc64/dev/iommureg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: iommureg.h,v 1.8 2003/05/22 21:56:45 jason Exp $ */
+/* $OpenBSD: iommureg.h,v 1.9 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/dev/sbus.c b/sys/arch/sparc64/dev/sbus.c
index 0bfe842cc9c..b398aab5cf0 100644
--- a/sys/arch/sparc64/dev/sbus.c
+++ b/sys/arch/sparc64/dev/sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbus.c,v 1.16 2003/03/06 08:26:08 henric Exp $ */
+/* $OpenBSD: sbus.c,v 1.17 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: sbus.c,v 1.46 2001/10/07 20:30:41 eeh Exp $ */
/*-
@@ -58,11 +58,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/dev/sbusvar.h b/sys/arch/sparc64/dev/sbusvar.h
index 63249b64984..f05ea6d05eb 100644
--- a/sys/arch/sparc64/dev/sbusvar.h
+++ b/sys/arch/sparc64/dev/sbusvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbusvar.h,v 1.5 2003/02/17 01:29:20 henric Exp $ */
+/* $OpenBSD: sbusvar.h,v 1.6 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: sbusvar.h,v 1.7 1999/06/05 05:30:43 mrg Exp $ */
/*-
@@ -58,11 +58,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/dev/upavar.h b/sys/arch/sparc64/dev/upavar.h
index a183f3b73a7..4fccc11d492 100644
--- a/sys/arch/sparc64/dev/upavar.h
+++ b/sys/arch/sparc64/dev/upavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: upavar.h,v 1.5 2002/06/11 06:44:34 jason Exp $ */
+/* $OpenBSD: upavar.h,v 1.6 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: upavar.h,v 1.2 2000/01/14 14:33:31 pk Exp $ */
/*-
@@ -58,11 +58,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c
index 001d1f53ccf..ef53e0ad124 100644
--- a/sys/arch/sparc64/dev/z8530kbd.c
+++ b/sys/arch/sparc64/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530kbd.c,v 1.14 2003/03/09 01:43:46 miod Exp $ */
+/* $OpenBSD: z8530kbd.c,v 1.15 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -53,11 +53,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/dev/z8530reg.h b/sys/arch/sparc64/dev/z8530reg.h
index 1ba1faa9b95..f92cc2cc416 100644
--- a/sys/arch/sparc64/dev/z8530reg.h
+++ b/sys/arch/sparc64/dev/z8530reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530reg.h,v 1.1 2001/08/21 21:42:30 jason Exp $ */
+/* $OpenBSD: z8530reg.h,v 1.2 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: z8530reg.h,v 1.9 1998/07/31 05:08:38 wrstuden Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/dev/z8530sc.c b/sys/arch/sparc64/dev/z8530sc.c
index df0a27bd052..bfc1dcc34f3 100644
--- a/sys/arch/sparc64/dev/z8530sc.c
+++ b/sys/arch/sparc64/dev/z8530sc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530sc.c,v 1.2 2002/03/14 01:26:45 millert Exp $ */
+/* $OpenBSD: z8530sc.c,v 1.3 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: z8530sc.c,v 1.15 2001/07/07 15:53:22 thorpej Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/dev/z8530sc.h b/sys/arch/sparc64/dev/z8530sc.h
index 6cde4b1329f..6dea20b7251 100644
--- a/sys/arch/sparc64/dev/z8530sc.h
+++ b/sys/arch/sparc64/dev/z8530sc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530sc.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */
+/* $OpenBSD: z8530sc.h,v 1.4 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: z8530sc.h,v 1.15 2001/05/11 01:40:48 thorpej Exp $ */
/*
@@ -23,11 +23,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/dev/z8530tty.c b/sys/arch/sparc64/dev/z8530tty.c
index 59c864b2d2e..f9cb77836c8 100644
--- a/sys/arch/sparc64/dev/z8530tty.c
+++ b/sys/arch/sparc64/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530tty.c,v 1.6 2002/08/06 15:15:51 jason Exp $ */
+/* $OpenBSD: z8530tty.c,v 1.7 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -53,11 +53,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu.c b/sys/arch/sparc64/fpu/fpu.c
index adc48586b3f..b5558333eb2 100644
--- a/sys/arch/sparc64/fpu/fpu.c
+++ b/sys/arch/sparc64/fpu/fpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu.c,v 1.9 2003/06/02 20:03:37 jason Exp $ */
+/* $OpenBSD: fpu.c,v 1.10 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu.c,v 1.11 2000/12/06 01:47:50 mrg Exp $ */
/*
@@ -48,11 +48,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_add.c b/sys/arch/sparc64/fpu/fpu_add.c
index 3bbd5db4828..40c84885374 100644
--- a/sys/arch/sparc64/fpu/fpu_add.c
+++ b/sys/arch/sparc64/fpu/fpu_add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_add.c,v 1.1 2001/09/08 22:33:51 jason Exp $ */
+/* $OpenBSD: fpu_add.c,v 1.2 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_arith.h b/sys/arch/sparc64/fpu/fpu_arith.h
index f15960c0f38..59589f86710 100644
--- a/sys/arch/sparc64/fpu/fpu_arith.h
+++ b/sys/arch/sparc64/fpu/fpu_arith.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_arith.h,v 1.1 2001/09/08 22:33:51 jason Exp $ */
+/* $OpenBSD: fpu_arith.h,v 1.2 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_arith.h,v 1.2 1994/11/20 20:52:35 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_compare.c b/sys/arch/sparc64/fpu/fpu_compare.c
index f0df6f716a4..398d033ee3b 100644
--- a/sys/arch/sparc64/fpu/fpu_compare.c
+++ b/sys/arch/sparc64/fpu/fpu_compare.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_compare.c,v 1.2 2001/09/10 20:39:04 jason Exp $ */
+/* $OpenBSD: fpu_compare.c,v 1.3 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_div.c b/sys/arch/sparc64/fpu/fpu_div.c
index a7a622ffad3..dce066765c5 100644
--- a/sys/arch/sparc64/fpu/fpu_div.c
+++ b/sys/arch/sparc64/fpu/fpu_div.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_div.c,v 1.1 2001/09/08 22:33:51 jason Exp $ */
+/* $OpenBSD: fpu_div.c,v 1.2 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_emu.h b/sys/arch/sparc64/fpu/fpu_emu.h
index 3560f00b196..23cad4fc05f 100644
--- a/sys/arch/sparc64/fpu/fpu_emu.h
+++ b/sys/arch/sparc64/fpu/fpu_emu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_emu.h,v 1.3 2001/10/05 17:43:09 jason Exp $ */
+/* $OpenBSD: fpu_emu.h,v 1.4 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_explode.c b/sys/arch/sparc64/fpu/fpu_explode.c
index bf059d82703..e3c2fcf1b17 100644
--- a/sys/arch/sparc64/fpu/fpu_explode.c
+++ b/sys/arch/sparc64/fpu/fpu_explode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_explode.c,v 1.2 2001/09/10 16:05:17 jason Exp $ */
+/* $OpenBSD: fpu_explode.c,v 1.3 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_implode.c b/sys/arch/sparc64/fpu/fpu_implode.c
index d81ffbd688b..68b9d726969 100644
--- a/sys/arch/sparc64/fpu/fpu_implode.c
+++ b/sys/arch/sparc64/fpu/fpu_implode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_implode.c,v 1.4 2002/03/14 01:26:45 millert Exp $ */
+/* $OpenBSD: fpu_implode.c,v 1.5 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_implode.c,v 1.7 2000/08/03 18:32:08 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_mul.c b/sys/arch/sparc64/fpu/fpu_mul.c
index 150120b00e6..38d16166030 100644
--- a/sys/arch/sparc64/fpu/fpu_mul.c
+++ b/sys/arch/sparc64/fpu/fpu_mul.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_mul.c,v 1.1 2001/09/08 22:33:51 jason Exp $ */
+/* $OpenBSD: fpu_mul.c,v 1.2 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_sqrt.c b/sys/arch/sparc64/fpu/fpu_sqrt.c
index 9b296814187..c8c1df9d876 100644
--- a/sys/arch/sparc64/fpu/fpu_sqrt.c
+++ b/sys/arch/sparc64/fpu/fpu_sqrt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_sqrt.c,v 1.1 2001/09/08 22:33:51 jason Exp $ */
+/* $OpenBSD: fpu_sqrt.c,v 1.2 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/fpu/fpu_subr.c b/sys/arch/sparc64/fpu/fpu_subr.c
index 9d9903cd95a..efc44e6a8cf 100644
--- a/sys/arch/sparc64/fpu/fpu_subr.c
+++ b/sys/arch/sparc64/fpu/fpu_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_subr.c,v 1.1 2001/09/08 22:33:51 jason Exp $ */
+/* $OpenBSD: fpu_subr.c,v 1.2 2003/06/02 23:27:55 millert Exp $ */
/* $NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/ansi.h b/sys/arch/sparc64/include/ansi.h
index 8fe12fa0181..2c7380ccb86 100644
--- a/sys/arch/sparc64/include/ansi.h
+++ b/sys/arch/sparc64/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.2 2002/03/19 15:30:27 kevlo Exp $ */
+/* $OpenBSD: ansi.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: ansi.h,v 1.7 2001/01/03 10:09:04 takemura Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/autoconf.h b/sys/arch/sparc64/include/autoconf.h
index cbe44f894ea..d317bfb178e 100644
--- a/sys/arch/sparc64/include/autoconf.h
+++ b/sys/arch/sparc64/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.h,v 1.8 2002/06/15 17:23:31 art Exp $ */
+/* $OpenBSD: autoconf.h,v 1.9 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: autoconf.h,v 1.10 2001/07/24 19:32:11 eeh Exp $ */
/*-
@@ -58,11 +58,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/bsd_openprom.h b/sys/arch/sparc64/include/bsd_openprom.h
index 19ee5997afc..40c67837fe6 100644
--- a/sys/arch/sparc64/include/bsd_openprom.h
+++ b/sys/arch/sparc64/include/bsd_openprom.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bsd_openprom.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */
+/* $OpenBSD: bsd_openprom.h,v 1.4 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: bsd_openprom.h,v 1.2 2000/03/13 23:52:34 soren Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 634645067d9..9b28cfedc7f 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.20 2003/05/16 22:14:13 henric Exp $ */
+/* $OpenBSD: cpu.h,v 1.21 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/float.h b/sys/arch/sparc64/include/float.h
index ba7396ae0ad..7e7e5efb493 100644
--- a/sys/arch/sparc64/include/float.h
+++ b/sys/arch/sparc64/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */
+/* $OpenBSD: float.h,v 1.4 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/frame.h b/sys/arch/sparc64/include/frame.h
index cff65de71d4..1fdbc879bc9 100644
--- a/sys/arch/sparc64/include/frame.h
+++ b/sys/arch/sparc64/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.3 2003/02/17 01:29:20 henric Exp $ */
+/* $OpenBSD: frame.h,v 1.4 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: frame.h,v 1.9 2001/03/04 09:28:35 mrg Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/fsr.h b/sys/arch/sparc64/include/fsr.h
index 7587f8a2aac..4bae78c4639 100644
--- a/sys/arch/sparc64/include/fsr.h
+++ b/sys/arch/sparc64/include/fsr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsr.h,v 1.1 2001/08/18 04:16:40 jason Exp $ */
+/* $OpenBSD: fsr.h,v 1.2 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: fsr.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/ieee.h b/sys/arch/sparc64/include/ieee.h
index b8fa927874b..8b60c991853 100644
--- a/sys/arch/sparc64/include/ieee.h
+++ b/sys/arch/sparc64/include/ieee.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee.h,v 1.1 2001/08/18 20:24:24 jason Exp $ */
+/* $OpenBSD: ieee.h,v 1.2 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: ieee.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/instr.h b/sys/arch/sparc64/include/instr.h
index 72bab42a23d..b172905f720 100644
--- a/sys/arch/sparc64/include/instr.h
+++ b/sys/arch/sparc64/include/instr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: instr.h,v 1.2 2001/09/15 23:42:37 jason Exp $ */
+/* $OpenBSD: instr.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: instr.h,v 1.3 2000/01/10 03:53:20 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/int_types.h b/sys/arch/sparc64/include/int_types.h
index 5e5d863ee6d..87c6aad1760 100644
--- a/sys/arch/sparc64/include/int_types.h
+++ b/sys/arch/sparc64/include/int_types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: int_types.h,v 1.3 2002/04/19 11:04:24 espie Exp $ */
+/* $OpenBSD: int_types.h,v 1.4 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: int_types.h,v 1.7 2001/04/28 15:41:33 kleink Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/limits.h b/sys/arch/sparc64/include/limits.h
index 451087fd1b0..6cb7f1e3e4f 100644
--- a/sys/arch/sparc64/include/limits.h
+++ b/sys/arch/sparc64/include/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.5 2002/07/30 01:22:00 millert Exp $ */
+/* $OpenBSD: limits.h,v 1.6 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: limits.h,v 1.8 2000/08/08 22:31:14 tshiozak Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/openpromio.h b/sys/arch/sparc64/include/openpromio.h
index b32f8bdf3a7..2a4b23769f7 100644
--- a/sys/arch/sparc64/include/openpromio.h
+++ b/sys/arch/sparc64/include/openpromio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: openpromio.h,v 1.2 2001/08/20 20:23:52 jason Exp $ */
+/* $OpenBSD: openpromio.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: openpromio.h,v 1.1.1.1 1998/06/20 04:58:52 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h
index 1839527cce7..e6f6e1a7eca 100644
--- a/sys/arch/sparc64/include/param.h
+++ b/sys/arch/sparc64/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.11 2002/06/15 17:23:31 art Exp $ */
+/* $OpenBSD: param.h,v 1.12 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/pcb.h b/sys/arch/sparc64/include/pcb.h
index baa5fd6317f..a0f4e42f856 100644
--- a/sys/arch/sparc64/include/pcb.h
+++ b/sys/arch/sparc64/include/pcb.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcb.h,v 1.3 2002/10/10 17:00:57 pvalchev Exp $ */
+/* $OpenBSD: pcb.h,v 1.4 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: pcb.h,v 1.7 2000/12/29 17:12:05 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/proc.h b/sys/arch/sparc64/include/proc.h
index 714fb55f871..a39c6f04f61 100644
--- a/sys/arch/sparc64/include/proc.h
+++ b/sys/arch/sparc64/include/proc.h
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/profile.h b/sys/arch/sparc64/include/profile.h
index 2957ece7a0c..e2a46dd7530 100644
--- a/sys/arch/sparc64/include/profile.h
+++ b/sys/arch/sparc64/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.2 2001/09/02 14:37:37 art Exp $ */
+/* $OpenBSD: profile.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h
index a4ca60226b8..be288e28e6d 100644
--- a/sys/arch/sparc64/include/psl.h
+++ b/sys/arch/sparc64/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.10 2003/05/23 02:00:51 henric Exp $ */
+/* $OpenBSD: psl.h,v 1.11 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/ptrace.h b/sys/arch/sparc64/include/ptrace.h
index 5c46130b559..194d9521ecb 100644
--- a/sys/arch/sparc64/include/ptrace.h
+++ b/sys/arch/sparc64/include/ptrace.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ptrace.h,v 1.1 2001/08/18 20:04:47 jason Exp $ */
+/* $OpenBSD: ptrace.h,v 1.2 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: ptrace.h,v 1.1.1.1 1998/06/20 04:58:52 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/reg.h b/sys/arch/sparc64/include/reg.h
index 5f6e81e3415..33cc924f277 100644
--- a/sys/arch/sparc64/include/reg.h
+++ b/sys/arch/sparc64/include/reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reg.h,v 1.3 2002/06/15 17:23:31 art Exp $ */
+/* $OpenBSD: reg.h,v 1.4 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: reg.h,v 1.8 2001/06/19 12:59:16 wiz Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/signal.h b/sys/arch/sparc64/include/signal.h
index 237ba5b6191..f72c8509952 100644
--- a/sys/arch/sparc64/include/signal.h
+++ b/sys/arch/sparc64/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.4 2002/06/15 17:23:31 art Exp $ */
+/* $OpenBSD: signal.h,v 1.5 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: signal.h,v 1.10 2001/05/09 19:50:49 kleink Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/stdarg.h b/sys/arch/sparc64/include/stdarg.h
index 0612ca74c9b..3687adbdbc5 100644
--- a/sys/arch/sparc64/include/stdarg.h
+++ b/sys/arch/sparc64/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.2 2002/04/19 11:04:24 espie Exp $ */
+/* $OpenBSD: stdarg.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: stdarg.h,v 1.11 2000/07/23 21:36:56 mycroft Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/types.h b/sys/arch/sparc64/include/types.h
index 6c73c6f00c9..22ab098fb4a 100644
--- a/sys/arch/sparc64/include/types.h
+++ b/sys/arch/sparc64/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.5 2002/10/06 19:58:31 art Exp $ */
+/* $OpenBSD: types.h,v 1.6 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: types.h,v 1.17 2001/05/12 22:42:07 kleink Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/varargs.h b/sys/arch/sparc64/include/varargs.h
index 24f21363d18..d2699bf2500 100644
--- a/sys/arch/sparc64/include/varargs.h
+++ b/sys/arch/sparc64/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.1 2001/09/10 22:46:47 art Exp $ */
+/* $OpenBSD: varargs.h,v 1.2 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: varargs.h,v 1.10 1995/12/29 18:53:02 mycroft Exp $ */
/*
@@ -27,11 +27,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/vmparam.h b/sys/arch/sparc64/include/vmparam.h
index 8c3915047c3..576572b6ab0 100644
--- a/sys/arch/sparc64/include/vmparam.h
+++ b/sys/arch/sparc64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.10 2002/07/20 21:38:52 art Exp $ */
+/* $OpenBSD: vmparam.h,v 1.11 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: vmparam.h,v 1.18 2001/05/01 02:19:19 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/vuid_event.h b/sys/arch/sparc64/include/vuid_event.h
index 1d9821b0ae3..c09c22c43d7 100644
--- a/sys/arch/sparc64/include/vuid_event.h
+++ b/sys/arch/sparc64/include/vuid_event.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vuid_event.h,v 1.2 2001/08/20 20:23:52 jason Exp $ */
+/* $OpenBSD: vuid_event.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: vuid_event.h,v 1.1.1.1 1998/06/20 04:58:52 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/include/z8530var.h b/sys/arch/sparc64/include/z8530var.h
index 3f2a2672d26..dcfd8d393f6 100644
--- a/sys/arch/sparc64/include/z8530var.h
+++ b/sys/arch/sparc64/include/z8530var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530var.h,v 1.4 2002/03/14 01:26:45 millert Exp $ */
+/* $OpenBSD: z8530var.h,v 1.5 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: z8530var.h,v 1.4 2000/11/08 23:41:42 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index 7677e8d7583..53f5516b7b9 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.31 2003/04/06 18:54:19 ho Exp $ */
+/* $OpenBSD: autoconf.c,v 1.32 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
/*
@@ -25,11 +25,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 0ea10d4c678..006f60a3aad 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.34 2003/05/14 00:20:37 tedu Exp $ */
+/* $OpenBSD: conf.c,v 1.35 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/genassym.cf b/sys/arch/sparc64/sparc64/genassym.cf
index 814da1b00e3..f89289bf7a1 100644
--- a/sys/arch/sparc64/sparc64/genassym.cf
+++ b/sys/arch/sparc64/sparc64/genassym.cf
@@ -55,11 +55,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/sparc64/sparc64/intreg.h b/sys/arch/sparc64/sparc64/intreg.h
index e0c98037af3..7c562c62de1 100644
--- a/sys/arch/sparc64/sparc64/intreg.h
+++ b/sys/arch/sparc64/sparc64/intreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intreg.h,v 1.2 2002/03/14 01:26:45 millert Exp $ */
+/* $OpenBSD: intreg.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: intreg.h,v 1.4 2000/06/24 04:21:05 eeh Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/locore2.c b/sys/arch/sparc64/sparc64/locore2.c
index baf57dab567..f31cc7483af 100644
--- a/sys/arch/sparc64/sparc64/locore2.c
+++ b/sys/arch/sparc64/sparc64/locore2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore2.c,v 1.2 2001/08/20 20:23:53 jason Exp $ */
+/* $OpenBSD: locore2.c,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: locore2.c,v 1.2 2000/05/26 21:20:21 thorpej Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 47736c26394..eaf697e3a7c 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.61 2003/06/02 18:14:16 jason Exp $ */
+/* $OpenBSD: machdep.c,v 1.62 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
/*-
@@ -59,11 +59,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/mem.c b/sys/arch/sparc64/sparc64/mem.c
index 5c3884e5087..a8d34e30b4e 100644
--- a/sys/arch/sparc64/sparc64/mem.c
+++ b/sys/arch/sparc64/sparc64/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.7 2003/01/09 22:27:11 miod Exp $ */
+/* $OpenBSD: mem.c,v 1.8 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: mem.c,v 1.18 2001/04/24 04:31:12 thorpej Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/netbsd_machdep.c b/sys/arch/sparc64/sparc64/netbsd_machdep.c
index 7bbf4f02e51..a3d87143e31 100644
--- a/sys/arch/sparc64/sparc64/netbsd_machdep.c
+++ b/sys/arch/sparc64/sparc64/netbsd_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netbsd_machdep.c,v 1.4 2002/07/20 19:24:57 art Exp $ */
+/* $OpenBSD: netbsd_machdep.c,v 1.5 2003/06/02 23:27:56 millert Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -58,11 +58,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/openprom.c b/sys/arch/sparc64/sparc64/openprom.c
index ded08ae9db1..4a27b820dbb 100644
--- a/sys/arch/sparc64/sparc64/openprom.c
+++ b/sys/arch/sparc64/sparc64/openprom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openprom.c,v 1.10 2003/03/07 14:54:49 jason Exp $ */
+/* $OpenBSD: openprom.c,v 1.11 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: openprom.c,v 1.4 2002/01/10 06:21:53 briggs Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/process_machdep.c b/sys/arch/sparc64/sparc64/process_machdep.c
index eaf29ff35c7..77cf99b470c 100644
--- a/sys/arch/sparc64/sparc64/process_machdep.c
+++ b/sys/arch/sparc64/sparc64/process_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process_machdep.c,v 1.5 2002/06/15 17:23:31 art Exp $ */
+/* $OpenBSD: process_machdep.c,v 1.6 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: process_machdep.c,v 1.10 2000/09/26 22:05:50 eeh Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/sys_machdep.c b/sys/arch/sparc64/sparc64/sys_machdep.c
index 9200507e543..46b971d4490 100644
--- a/sys/arch/sparc64/sparc64/sys_machdep.c
+++ b/sys/arch/sparc64/sparc64/sys_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_machdep.c,v 1.2 2001/08/20 20:23:53 jason Exp $ */
+/* $OpenBSD: sys_machdep.c,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: sys_machdep.c,v 1.3 2000/12/13 18:13:11 jdolecek Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/sparc64/timerreg.h b/sys/arch/sparc64/sparc64/timerreg.h
index a4277342595..20fc45eb1cc 100644
--- a/sys/arch/sparc64/sparc64/timerreg.h
+++ b/sys/arch/sparc64/sparc64/timerreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: timerreg.h,v 1.2 2001/08/20 20:23:53 jason Exp $ */
+/* $OpenBSD: timerreg.h,v 1.3 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: timerreg.h,v 1.3 1999/06/05 05:10:01 mrg Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/sparc64/stand/bootblk/genfth.cf b/sys/arch/sparc64/stand/bootblk/genfth.cf
index ed3a067cce5..5df5f2e37e0 100644
--- a/sys/arch/sparc64/stand/bootblk/genfth.cf
+++ b/sys/arch/sparc64/stand/bootblk/genfth.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genfth.cf,v 1.1 2001/08/18 04:16:37 jason Exp $
+# $OpenBSD: genfth.cf,v 1.2 2003/06/02 23:27:56 millert Exp $
# $NetBSD: genfth.cf,v 1.1 2000/08/20 14:58:46 mrg Exp $
#
@@ -56,11 +56,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/sys/arch/vax/bi/bireg.h b/sys/arch/vax/bi/bireg.h
index 6b9a68d00c1..c540004b0ae 100644
--- a/sys/arch/vax/bi/bireg.h
+++ b/sys/arch/vax/bi/bireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bireg.h,v 1.4 2002/06/11 09:36:23 hugh Exp $ */
+/* $OpenBSD: bireg.h,v 1.5 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: bireg.h,v 1.7 2000/07/06 17:47:02 ragge Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/bi/if_nireg.h b/sys/arch/vax/bi/if_nireg.h
index 84abcac4e90..42abf1aa728 100644
--- a/sys/arch/vax/bi/if_nireg.h
+++ b/sys/arch/vax/bi/if_nireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nireg.h,v 1.1 2002/06/11 09:36:23 hugh Exp $ */
+/* $OpenBSD: if_nireg.h,v 1.2 2003/06/02 23:27:56 millert Exp $ */
/* $NetBSD: if_nireg.h,v 1.3 2001/08/20 12:20:07 wiz Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/bi/kdbreg.h b/sys/arch/vax/bi/kdbreg.h
index 0103bb7e21e..46f28145610 100644
--- a/sys/arch/vax/bi/kdbreg.h
+++ b/sys/arch/vax/bi/kdbreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kdbreg.h,v 1.4 2002/06/11 09:36:23 hugh Exp $ */
+/* $OpenBSD: kdbreg.h,v 1.5 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: kdbreg.h,v 1.3 1999/11/03 21:57:40 ragge Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/boot/boot/boot.c b/sys/arch/vax/boot/boot/boot.c
index dd5a4756e98..09496d0631d 100644
--- a/sys/arch/vax/boot/boot/boot.c
+++ b/sys/arch/vax/boot/boot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.10 2002/06/11 09:36:23 hugh Exp $ */
+/* $OpenBSD: boot.c,v 1.11 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: boot.c,v 1.18 2002/05/31 15:58:26 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/boot/xxboot/bootxx.c b/sys/arch/vax/boot/xxboot/bootxx.c
index 081f9a83552..9cdd9abfcf4 100644
--- a/sys/arch/vax/boot/xxboot/bootxx.c
+++ b/sys/arch/vax/boot/xxboot/bootxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bootxx.c,v 1.8 2002/08/11 20:02:06 hugh Exp $ */
+/* $OpenBSD: bootxx.c,v 1.9 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: bootxx.c,v 1.16 2002/03/29 05:45:08 matt Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/dec/dzkbd.c b/sys/arch/vax/dec/dzkbd.c
index 29767ccd802..fb515952c8e 100644
--- a/sys/arch/vax/dec/dzkbd.c
+++ b/sys/arch/vax/dec/dzkbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dzkbd.c,v 1.3 2002/03/14 01:26:47 millert Exp $ */
+/* $OpenBSD: dzkbd.c,v 1.4 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: dzkbd.c,v 1.1 2000/12/02 17:03:55 ragge Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/dec/dzms.c b/sys/arch/vax/dec/dzms.c
index 52680d026ef..bbb227ae121 100644
--- a/sys/arch/vax/dec/dzms.c
+++ b/sys/arch/vax/dec/dzms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dzms.c,v 1.2 2002/03/14 01:26:47 millert Exp $ */
+/* $OpenBSD: dzms.c,v 1.3 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: dzms.c,v 1.1 2000/12/02 17:03:55 ragge Exp $ */
/*
@@ -22,11 +22,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c
index a446eaf2fc1..09ef89e4cde 100644
--- a/sys/arch/vax/if/if_de.c
+++ b/sys/arch/vax/if/if_de.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_de.c,v 1.12 2002/03/14 01:26:47 millert Exp $ */
+/* $OpenBSD: if_de.c,v 1.13 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: if_de.c,v 1.27 1997/04/19 15:02:29 ragge Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/if/if_dereg.h b/sys/arch/vax/if/if_dereg.h
index 5732baf964a..d8f8c8fd4a9 100644
--- a/sys/arch/vax/if/if_dereg.h
+++ b/sys/arch/vax/if/if_dereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_dereg.h,v 1.3 1997/05/29 00:04:32 niklas Exp $ */
+/* $OpenBSD: if_dereg.h,v 1.4 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: if_dereg.h,v 1.3 1996/04/08 18:34:55 ragge Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/if/if_le.c b/sys/arch/vax/if/if_le.c
index 2471ca846a2..847b9bad707 100644
--- a/sys/arch/vax/if/if_le.c
+++ b/sys/arch/vax/if/if_le.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le.c,v 1.10 2002/06/11 09:36:24 hugh Exp $ */
+/* $OpenBSD: if_le.c,v 1.11 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: if_le.c,v 1.14 1999/08/14 18:40:23 ragge Exp $ */
/*-
@@ -53,11 +53,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/if/if_qereg.h b/sys/arch/vax/if/if_qereg.h
index dbf83d21e95..cefc57288aa 100644
--- a/sys/arch/vax/if/if_qereg.h
+++ b/sys/arch/vax/if/if_qereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_qereg.h,v 1.6 2003/02/04 02:03:51 hugh Exp $ */
+/* $OpenBSD: if_qereg.h,v 1.7 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: if_qereg.h,v 1.6 2001/06/19 13:42:18 wiz Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/if/if_uba.c b/sys/arch/vax/if/if_uba.c
index a497371c73f..025cd5df187 100644
--- a/sys/arch/vax/if/if_uba.c
+++ b/sys/arch/vax/if/if_uba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_uba.c,v 1.9 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: if_uba.c,v 1.10 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: if_uba.c,v 1.15 1999/01/01 21:43:18 ragge Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/if/if_uba.h b/sys/arch/vax/if/if_uba.h
index 7357b82b81c..a481a902f4e 100644
--- a/sys/arch/vax/if/if_uba.h
+++ b/sys/arch/vax/if/if_uba.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_uba.h,v 1.5 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: if_uba.h,v 1.6 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: if_uba.h,v 1.6 1996/08/20 14:07:50 ragge Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/if/if_zereg.h b/sys/arch/vax/if/if_zereg.h
index 99b1a2bdbaa..e64ed6f9f42 100644
--- a/sys/arch/vax/if/if_zereg.h
+++ b/sys/arch/vax/if/if_zereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_zereg.h,v 1.1 2000/04/27 03:14:43 bjc Exp $ */
+/* $OpenBSD: if_zereg.h,v 1.2 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: if_zereg.h,v 1.1 1998/07/01 10:52:10 ragge Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/if/sgecreg.h b/sys/arch/vax/if/sgecreg.h
index c3a2090e314..c15e21e1135 100644
--- a/sys/arch/vax/if/sgecreg.h
+++ b/sys/arch/vax/if/sgecreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sgecreg.h,v 1.1 2000/04/27 03:14:44 bjc Exp $ */
+/* $OpenBSD: sgecreg.h,v 1.2 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: sgecreg.h,v 1.1 1999/08/08 11:41:29 ragge Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/ansi.h b/sys/arch/vax/include/ansi.h
index 446757e7c9f..b45ca1ded65 100644
--- a/sys/arch/vax/include/ansi.h
+++ b/sys/arch/vax/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.8 2000/04/26 03:08:40 bjc Exp $ */
+/* $OpenBSD: ansi.h,v 1.9 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: ansi.h,v 1.7 1998/04/27 17:39:11 kleink Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/asm.h b/sys/arch/vax/include/asm.h
index 4752c522991..6b6345ae5ff 100644
--- a/sys/arch/vax/include/asm.h
+++ b/sys/arch/vax/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.7 2002/11/05 18:04:36 miod Exp $ */
+/* $OpenBSD: asm.h,v 1.8 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: asm.h,v 1.9 1999/01/15 13:31:28 bouyer Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/float.h b/sys/arch/vax/include/float.h
index 2b387ae649a..ffcf2df33ea 100644
--- a/sys/arch/vax/include/float.h
+++ b/sys/arch/vax/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.5 2002/05/11 14:46:41 millert Exp $ */
+/* $OpenBSD: float.h,v 1.6 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: float.h,v 1.5 1998/10/10 02:13:55 matt Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/ioa.h b/sys/arch/vax/include/ioa.h
index 5518d18a36f..0378c1d8203 100644
--- a/sys/arch/vax/include/ioa.h
+++ b/sys/arch/vax/include/ioa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ioa.h,v 1.7 2001/08/25 13:33:36 hugh Exp $ */
+/* $OpenBSD: ioa.h,v 1.8 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: ioa.h,v 1.6 2000/01/24 02:40:32 matt Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/ka630.h b/sys/arch/vax/include/ka630.h
index f25656bc280..9bce6065483 100644
--- a/sys/arch/vax/include/ka630.h
+++ b/sys/arch/vax/include/ka630.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka630.h,v 1.5 2002/06/11 09:36:24 hugh Exp $ */
+/* $OpenBSD: ka630.h,v 1.6 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: ka630.h,v 1.5 2000/07/19 01:01:58 matt Exp $ */
/*-
* Copyright (c) 1986, 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/ka650.h b/sys/arch/vax/include/ka650.h
index 6eb4b1587dd..512bb8bee01 100644
--- a/sys/arch/vax/include/ka650.h
+++ b/sys/arch/vax/include/ka650.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka650.h,v 1.9 2001/08/12 12:03:03 heko Exp $ */
+/* $OpenBSD: ka650.h,v 1.10 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: ka650.h,v 1.6 1997/07/26 10:12:43 ragge Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/ka820.h b/sys/arch/vax/include/ka820.h
index 8498a3f673e..45544ce9ce7 100644
--- a/sys/arch/vax/include/ka820.h
+++ b/sys/arch/vax/include/ka820.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka820.h,v 1.4 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: ka820.h,v 1.5 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: ka820.h,v 1.3 2000/01/24 02:40:32 matt Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/limits.h b/sys/arch/vax/include/limits.h
index 6276c2f0f77..9abebfc755f 100644
--- a/sys/arch/vax/include/limits.h
+++ b/sys/arch/vax/include/limits.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: limits.h,v 1.10 2002/07/30 01:22:00 millert Exp $ */
+/* $OpenBSD: limits.h,v 1.11 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: limits.h,v 1.9 2000/03/07 19:33:01 kleink Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/nexus.h b/sys/arch/vax/include/nexus.h
index 9a377317deb..0a3c13b5ff6 100644
--- a/sys/arch/vax/include/nexus.h
+++ b/sys/arch/vax/include/nexus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nexus.h,v 1.9 2001/08/25 13:33:36 hugh Exp $ */
+/* $OpenBSD: nexus.h,v 1.10 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: nexus.h,v 1.17 2000/06/04 17:58:19 ragge Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index 2a8349862a8..b232a1bb0f4 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.24 2002/05/06 21:38:26 millert Exp $ */
+/* $OpenBSD: param.h,v 1.25 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index cf768e3c853..e0e3e1114a6 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.18 2002/09/12 12:50:47 art Exp $ */
+/* $OpenBSD: pmap.h,v 1.19 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $ */
/*
@@ -20,11 +20,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/proc.h b/sys/arch/vax/include/proc.h
index af982fb0532..9c71621c1f4 100644
--- a/sys/arch/vax/include/proc.h
+++ b/sys/arch/vax/include/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.3 2000/04/26 03:08:42 bjc Exp $ */
+/* $OpenBSD: proc.h,v 1.4 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: proc.h,v 1.2 1994/10/26 08:02:21 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/profile.h b/sys/arch/vax/include/profile.h
index e25e03966a1..73190b6bca0 100644
--- a/sys/arch/vax/include/profile.h
+++ b/sys/arch/vax/include/profile.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: profile.h,v 1.6 2000/04/26 03:08:42 bjc Exp $ */
+/* $OpenBSD: profile.h,v 1.7 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: profile.h,v 1.5 1995/12/31 12:15:58 ragge Exp $ */
/*
* Copyright (c) 1992 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/psl.h b/sys/arch/vax/include/psl.h
index e9bb68bbb7a..9e89bec1721 100644
--- a/sys/arch/vax/include/psl.h
+++ b/sys/arch/vax/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.6 2002/06/07 21:33:43 nordin Exp $ */
+/* $OpenBSD: psl.h,v 1.7 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: psl.h,v 1.6 1997/06/07 12:15:28 ragge Exp $ */
/*
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/signal.h b/sys/arch/vax/include/signal.h
index 78068053dd7..d3a7f35d7ee 100644
--- a/sys/arch/vax/include/signal.h
+++ b/sys/arch/vax/include/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.2 1997/05/29 00:04:52 niklas Exp $ */
+/* $OpenBSD: signal.h,v 1.3 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: signal.h,v 1.4 1995/01/10 19:01:52 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/stdarg.h b/sys/arch/vax/include/stdarg.h
index f647fafff16..d77db2fba36 100644
--- a/sys/arch/vax/include/stdarg.h
+++ b/sys/arch/vax/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.5 2002/10/23 15:38:16 millert Exp $ */
+/* $OpenBSD: stdarg.h,v 1.6 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: stdarg.h,v 1.11 1999/05/03 16:30:34 christos Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/trap.h b/sys/arch/vax/include/trap.h
index 499c7e6d80d..5537927f304 100644
--- a/sys/arch/vax/include/trap.h
+++ b/sys/arch/vax/include/trap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.h,v 1.11 2001/08/25 13:33:36 hugh Exp $ */
+/* $OpenBSD: trap.h,v 1.12 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: trap.h,v 1.18 2000/06/04 02:19:26 matt Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/types.h b/sys/arch/vax/include/types.h
index 0a2c66a1d3d..b465a925475 100644
--- a/sys/arch/vax/include/types.h
+++ b/sys/arch/vax/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.11 2002/06/11 09:36:24 hugh Exp $ */
+/* $OpenBSD: types.h,v 1.12 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: types.h,v 1.14 1998/08/13 02:10:49 eeh Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/varargs.h b/sys/arch/vax/include/varargs.h
index 82043978a75..a235faa6468 100644
--- a/sys/arch/vax/include/varargs.h
+++ b/sys/arch/vax/include/varargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: varargs.h,v 1.4 1997/05/29 00:04:55 niklas Exp $ */
+/* $OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: varargs.h,v 1.9 1995/12/26 01:16:35 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h
index c038e833830..11626c62c72 100644
--- a/sys/arch/vax/include/vmparam.h
+++ b/sys/arch/vax/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.18 2002/02/17 22:59:53 maja Exp $ */
+/* $OpenBSD: vmparam.h,v 1.19 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: vmparam.h,v 1.32 2000/03/07 00:05:59 matt Exp $ */
/*-
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/mscp/mscp.c b/sys/arch/vax/mscp/mscp.c
index e7ad265ae51..801b401c16d 100644
--- a/sys/arch/vax/mscp/mscp.c
+++ b/sys/arch/vax/mscp/mscp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mscp.c,v 1.7 2002/01/10 00:11:14 nordin Exp $ */
+/* $OpenBSD: mscp.c,v 1.8 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: mscp.c,v 1.16 2001/11/13 07:38:28 lukem Exp $ */
/*
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/mscp/mscp.h b/sys/arch/vax/mscp/mscp.h
index 1c74b6f7388..c94f45d9b35 100644
--- a/sys/arch/vax/mscp/mscp.h
+++ b/sys/arch/vax/mscp/mscp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mscp.h,v 1.4 2000/04/27 03:14:46 bjc Exp $ */
+/* $OpenBSD: mscp.h,v 1.5 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: mscp.h,v 1.6 1999/05/29 19:11:16 ragge Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/mscp/mscp_disk.c b/sys/arch/vax/mscp/mscp_disk.c
index f0ffd73281f..5e54596af1f 100644
--- a/sys/arch/vax/mscp/mscp_disk.c
+++ b/sys/arch/vax/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mscp_disk.c,v 1.12 2002/06/12 12:29:15 hugh Exp $ */
+/* $OpenBSD: mscp_disk.c,v 1.13 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: mscp_disk.c,v 1.30 2001/11/13 07:38:28 lukem Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/mscp/mscp_subr.c b/sys/arch/vax/mscp/mscp_subr.c
index a7e8e85b66b..59ef5eb47ed 100644
--- a/sys/arch/vax/mscp/mscp_subr.c
+++ b/sys/arch/vax/mscp/mscp_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mscp_subr.c,v 1.6 2002/11/29 20:15:43 deraadt Exp $ */
+/* $OpenBSD: mscp_subr.c,v 1.7 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: mscp_subr.c,v 1.18 2001/11/13 07:38:28 lukem Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/mscp/mscpreg.h b/sys/arch/vax/mscp/mscpreg.h
index 660ab4638c9..68992ca277b 100644
--- a/sys/arch/vax/mscp/mscpreg.h
+++ b/sys/arch/vax/mscp/mscpreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mscpreg.h,v 1.4 2000/04/27 03:14:46 bjc Exp $ */
+/* $OpenBSD: mscpreg.h,v 1.5 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: mscpreg.h,v 1.4 1999/05/29 19:12:53 ragge Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/mscp/mscpvar.h b/sys/arch/vax/mscp/mscpvar.h
index 1469dc11c78..488d9beaa15 100644
--- a/sys/arch/vax/mscp/mscpvar.h
+++ b/sys/arch/vax/mscp/mscpvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mscpvar.h,v 1.5 2002/03/15 01:20:04 millert Exp $ */
+/* $OpenBSD: mscpvar.h,v 1.6 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: mscpvar.h,v 1.7 1999/06/06 19:16:18 ragge Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/dhu.c b/sys/arch/vax/qbus/dhu.c
index 002915b4c42..0ab774c002f 100644
--- a/sys/arch/vax/qbus/dhu.c
+++ b/sys/arch/vax/qbus/dhu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhu.c,v 1.9 2003/04/06 01:34:56 hugh Exp $ */
+/* $OpenBSD: dhu.c,v 1.10 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: dhu.c,v 1.19 2000/06/04 06:17:01 matt Exp $ */
/*
* Copyright (c) 2003, Hugh Graham.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/dl.c b/sys/arch/vax/qbus/dl.c
index d398c06f17d..cf88407cadc 100644
--- a/sys/arch/vax/qbus/dl.c
+++ b/sys/arch/vax/qbus/dl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dl.c,v 1.3 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: dl.c,v 1.4 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: dl.c,v 1.11 2000/01/24 02:40:29 matt Exp $ */
/*-
@@ -54,11 +54,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/dz.c b/sys/arch/vax/qbus/dz.c
index e75b6b03e1c..589a85c1e84 100644
--- a/sys/arch/vax/qbus/dz.c
+++ b/sys/arch/vax/qbus/dz.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dz.c,v 1.9 2003/04/02 23:45:29 jason Exp $ */
+/* $OpenBSD: dz.c,v 1.10 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: dz.c,v 1.23 2000/06/04 02:14:12 matt Exp $ */
/*
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/dzvar.h b/sys/arch/vax/qbus/dzvar.h
index 1c0c490867e..a01541fde41 100644
--- a/sys/arch/vax/qbus/dzvar.h
+++ b/sys/arch/vax/qbus/dzvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dzvar.h,v 1.4 2003/04/02 23:45:29 jason Exp $ */
+/* $OpenBSD: dzvar.h,v 1.5 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: dzvar.h,v 1.8 2000/06/04 02:14:12 matt Exp $ */
/*
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/if_de.c b/sys/arch/vax/qbus/if_de.c
index f6ca734e438..ca50876ef28 100644
--- a/sys/arch/vax/qbus/if_de.c
+++ b/sys/arch/vax/qbus/if_de.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_de.c,v 1.2 2003/05/11 19:41:12 deraadt Exp $ */
+/* $OpenBSD: if_de.c,v 1.3 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: if_de.c,v 1.11 2001/11/13 07:11:24 lukem Exp $ */
/*
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/if_dereg.h b/sys/arch/vax/qbus/if_dereg.h
index 54da29f4bf1..468a4a654d4 100644
--- a/sys/arch/vax/qbus/if_dereg.h
+++ b/sys/arch/vax/qbus/if_dereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_dereg.h,v 1.1 2002/06/11 09:36:24 hugh Exp $ */
+/* $OpenBSD: if_dereg.h,v 1.2 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: if_dereg.h,v 1.2 2000/05/28 17:23:44 ragge Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/qd.c b/sys/arch/vax/qbus/qd.c
index 5e9ec1cd481..8567dda9e1a 100644
--- a/sys/arch/vax/qbus/qd.c
+++ b/sys/arch/vax/qbus/qd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qd.c,v 1.6 2002/06/12 03:50:05 miod Exp $ */
+/* $OpenBSD: qd.c,v 1.7 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/qdioctl.h b/sys/arch/vax/qbus/qdioctl.h
index 3e91b891b01..8591fa520ce 100644
--- a/sys/arch/vax/qbus/qdioctl.h
+++ b/sys/arch/vax/qbus/qdioctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: qdioctl.h,v 1.1 2000/04/27 03:14:48 bjc Exp $ */
+/* $OpenBSD: qdioctl.h,v 1.2 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: qdioctl.h,v 1.1 1998/03/21 10:02:39 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/qdreg.h b/sys/arch/vax/qbus/qdreg.h
index d6aa7452ceb..eca53801287 100644
--- a/sys/arch/vax/qbus/qdreg.h
+++ b/sys/arch/vax/qbus/qdreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: qdreg.h,v 1.1 2000/04/27 03:14:48 bjc Exp $ */
+/* $OpenBSD: qdreg.h,v 1.2 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: qdreg.h,v 1.1 1998/03/21 10:02:39 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/qduser.h b/sys/arch/vax/qbus/qduser.h
index 21ca70f1aea..ae0cf5def5c 100644
--- a/sys/arch/vax/qbus/qduser.h
+++ b/sys/arch/vax/qbus/qduser.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: qduser.h,v 1.2 2002/01/23 19:16:09 fgsch Exp $ */
+/* $OpenBSD: qduser.h,v 1.3 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: qduser.h,v 1.1 1998/03/21 10:02:39 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/qevent.h b/sys/arch/vax/qbus/qevent.h
index 93e7c30acdd..6353d2afc6b 100644
--- a/sys/arch/vax/qbus/qevent.h
+++ b/sys/arch/vax/qbus/qevent.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: qevent.h,v 1.1 2000/04/27 03:14:48 bjc Exp $ */
+/* $OpenBSD: qevent.h,v 1.2 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: qevent.h,v 1.1 1998/03/21 10:02:39 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/qfont.c b/sys/arch/vax/qbus/qfont.c
index f7abecff5e7..9057f2d47ac 100644
--- a/sys/arch/vax/qbus/qfont.c
+++ b/sys/arch/vax/qbus/qfont.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qfont.c,v 1.1 2000/04/27 03:14:48 bjc Exp $ */
+/* $OpenBSD: qfont.c,v 1.2 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: qfont.c,v 1.4 1999/06/20 17:58:57 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/uba.c b/sys/arch/vax/qbus/uba.c
index 22e46225f03..30c1554d72e 100644
--- a/sys/arch/vax/qbus/uba.c
+++ b/sys/arch/vax/qbus/uba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uba.c,v 1.7 2003/02/03 19:43:24 hugh Exp $ */
+/* $OpenBSD: uba.c,v 1.8 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: uba.c,v 1.57 2001/04/26 19:16:07 ragge Exp $ */
/*
* Copyright (c) 1996 Jonathan Stone.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/ubavar.h b/sys/arch/vax/qbus/ubavar.h
index 5ed45cbd66e..ac84d51ce07 100644
--- a/sys/arch/vax/qbus/ubavar.h
+++ b/sys/arch/vax/qbus/ubavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubavar.h,v 1.4 2003/02/03 19:43:24 hugh Exp $ */
+/* $OpenBSD: ubavar.h,v 1.5 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: ubavar.h,v 1.31 2001/04/26 19:16:07 ragge Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/qbus/uda.c b/sys/arch/vax/qbus/uda.c
index 71bc3a648b0..c30f2d8ec4a 100644
--- a/sys/arch/vax/qbus/uda.c
+++ b/sys/arch/vax/qbus/uda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uda.c,v 1.3 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: uda.c,v 1.4 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: uda.c,v 1.36 2000/06/04 06:17:05 matt Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/stand/boot/boot.c b/sys/arch/vax/stand/boot/boot.c
index dd5a4756e98..09496d0631d 100644
--- a/sys/arch/vax/stand/boot/boot.c
+++ b/sys/arch/vax/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: boot.c,v 1.10 2002/06/11 09:36:23 hugh Exp $ */
+/* $OpenBSD: boot.c,v 1.11 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: boot.c,v 1.18 2002/05/31 15:58:26 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/stand/xxboot/bootxx.c b/sys/arch/vax/stand/xxboot/bootxx.c
index 081f9a83552..9cdd9abfcf4 100644
--- a/sys/arch/vax/stand/xxboot/bootxx.c
+++ b/sys/arch/vax/stand/xxboot/bootxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bootxx.c,v 1.8 2002/08/11 20:02:06 hugh Exp $ */
+/* $OpenBSD: bootxx.c,v 1.9 2003/06/02 23:27:57 millert Exp $ */
/* $NetBSD: bootxx.c,v 1.16 2002/03/29 05:45:08 matt Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/qv.c b/sys/arch/vax/uba/qv.c
index 75fcc6f95e1..980be7646e9 100644
--- a/sys/arch/vax/uba/qv.c
+++ b/sys/arch/vax/uba/qv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qv.c,v 1.5 2002/06/12 03:50:10 miod Exp $ */
+/* $OpenBSD: qv.c,v 1.6 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: qv.c,v 1.2 1996/09/02 06:44:28 mycroft Exp $ */
/*-
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/ts.c b/sys/arch/vax/uba/ts.c
index 49c1ca8bac1..cfdd47cb9bb 100644
--- a/sys/arch/vax/uba/ts.c
+++ b/sys/arch/vax/uba/ts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts.c,v 1.11 2002/06/10 21:56:11 miod Exp $ */
+/* $OpenBSD: ts.c,v 1.12 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: ts.c,v 1.11 1997/01/11 11:34:43 ragge Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c
index 3fd952b9742..36fbdf3d862 100644
--- a/sys/arch/vax/uba/uba.c
+++ b/sys/arch/vax/uba/uba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uba.c,v 1.16 2002/06/10 21:56:11 miod Exp $ */
+/* $OpenBSD: uba.c,v 1.17 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: uba.c,v 1.43 2000/01/24 02:40:36 matt Exp $ */
/*
* Copyright (c) 1996 Jonathan Stone.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/uba_cmi.c b/sys/arch/vax/uba/uba_cmi.c
index de8f78a15d3..85b8599d648 100644
--- a/sys/arch/vax/uba/uba_cmi.c
+++ b/sys/arch/vax/uba/uba_cmi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uba_cmi.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: uba_cmi.c,v 1.3 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: uba_cmi.c,v 1.2 1999/08/14 11:31:48 ragge Exp $ */
/*
* Copyright (c) 1996 Jonathan Stone.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/uba_common.h b/sys/arch/vax/uba/uba_common.h
index 564657d2d42..89e5be58fdc 100644
--- a/sys/arch/vax/uba/uba_common.h
+++ b/sys/arch/vax/uba/uba_common.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uba_common.h,v 1.2 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: uba_common.h,v 1.3 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: uba_common.h,v 1.2 1999/06/21 16:23:01 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -17,11 +17,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/uba_ibus.c b/sys/arch/vax/uba/uba_ibus.c
index bdd009d4514..42a7c9a1325 100644
--- a/sys/arch/vax/uba/uba_ibus.c
+++ b/sys/arch/vax/uba/uba_ibus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uba_ibus.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: uba_ibus.c,v 1.3 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: uba_ibus.c,v 1.1 1999/08/07 10:36:47 ragge Exp $ */
/*
* Copyright (c) 1996 Jonathan Stone.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/uba_mainbus.c b/sys/arch/vax/uba/uba_mainbus.c
index b4b7d7173cc..fc8b5a219cf 100644
--- a/sys/arch/vax/uba/uba_mainbus.c
+++ b/sys/arch/vax/uba/uba_mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uba_mainbus.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: uba_mainbus.c,v 1.3 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: uba_mainbus.c,v 1.2 1999/06/06 19:00:53 ragge Exp $ */
/*
* Copyright (c) 1996 Jonathan Stone.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/uba_sbi.c b/sys/arch/vax/uba/uba_sbi.c
index 90d46bbaadf..5e38a8946a7 100644
--- a/sys/arch/vax/uba/uba_sbi.c
+++ b/sys/arch/vax/uba/uba_sbi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uba_sbi.c,v 1.2 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: uba_sbi.c,v 1.3 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: uba_sbi.c,v 1.1 1999/06/21 16:23:01 ragge Exp $ */
/*
* Copyright (c) 1996 Jonathan Stone.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/ubareg.h b/sys/arch/vax/uba/ubareg.h
index 1eddbc950a6..fd2f979f99a 100644
--- a/sys/arch/vax/uba/ubareg.h
+++ b/sys/arch/vax/uba/ubareg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubareg.h,v 1.9 2001/08/25 13:33:37 hugh Exp $ */
+/* $OpenBSD: ubareg.h,v 1.10 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: ubareg.h,v 1.11 2000/01/24 02:40:36 matt Exp $ */
/*-
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/ubavar.h b/sys/arch/vax/uba/ubavar.h
index 9647a831952..fc250d03450 100644
--- a/sys/arch/vax/uba/ubavar.h
+++ b/sys/arch/vax/uba/ubavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubavar.h,v 1.12 2002/03/15 01:20:04 millert Exp $ */
+/* $OpenBSD: ubavar.h,v 1.13 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: ubavar.h,v 1.21 1999/01/19 21:04:48 ragge Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/uba/uda.c b/sys/arch/vax/uba/uda.c
index fceb9dbeb74..607f7bffaee 100644
--- a/sys/arch/vax/uba/uda.c
+++ b/sys/arch/vax/uba/uda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uda.c,v 1.10 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: uda.c,v 1.11 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: uda.c,v 1.25 1997/07/04 13:26:02 ragge Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/cfl.c b/sys/arch/vax/vax/cfl.c
index c2d88f17f1e..ed3128bf91e 100644
--- a/sys/arch/vax/vax/cfl.c
+++ b/sys/arch/vax/vax/cfl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfl.c,v 1.4 2002/06/10 21:56:11 miod Exp $ */
+/* $OpenBSD: cfl.c,v 1.5 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: cfl.c,v 1.2 1998/04/13 12:10:26 ragge Exp $ */
/*-
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index d2236e6c163..fb6d84a7c13 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.39 2003/05/14 00:20:37 tedu Exp $ */
+/* $OpenBSD: conf.c,v 1.40 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */
/*-
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/crl.c b/sys/arch/vax/vax/crl.c
index 64c9633df0c..0e703e183b8 100644
--- a/sys/arch/vax/vax/crl.c
+++ b/sys/arch/vax/vax/crl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crl.c,v 1.6 2002/06/10 21:56:11 miod Exp $ */
+/* $OpenBSD: crl.c,v 1.7 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: crl.c,v 1.6 2000/01/24 02:40:33 matt Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/crx.c b/sys/arch/vax/vax/crx.c
index 320a9abb899..3fcba586ff8 100644
--- a/sys/arch/vax/vax/crx.c
+++ b/sys/arch/vax/vax/crx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crx.c,v 1.3 2002/06/10 21:56:11 miod Exp $ */
+/* $OpenBSD: crx.c,v 1.4 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: crx.c,v 1.4 2000/01/24 02:40:33 matt Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/crx.h b/sys/arch/vax/vax/crx.h
index 8dc0fc383e9..b733f24c56a 100644
--- a/sys/arch/vax/vax/crx.h
+++ b/sys/arch/vax/vax/crx.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: crx.h,v 1.1 2000/04/27 01:10:10 bjc Exp $ */
+/* $OpenBSD: crx.h,v 1.2 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: crx.h,v 1.2 1999/01/19 21:04:48 ragge Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c
index 84e8b781147..33ba76f85df 100644
--- a/sys/arch/vax/vax/disksubr.c
+++ b/sys/arch/vax/vax/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.18 2002/04/29 19:12:31 miod Exp $ */
+/* $OpenBSD: disksubr.c,v 1.19 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: disksubr.c,v 1.21 1999/06/30 18:48:06 ragge Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/emulate.s b/sys/arch/vax/vax/emulate.s
index c09491f18ff..47b2b0e54b2 100644
--- a/sys/arch/vax/vax/emulate.s
+++ b/sys/arch/vax/vax/emulate.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: emulate.s,v 1.3 1997/09/10 12:04:44 maja Exp $ */
+/* $OpenBSD: emulate.s,v 1.4 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: emulate.s,v 1.2 1997/03/15 16:14:25 ragge Exp $ */
/*
* Copyright (c) 1986, 1987 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/in_cksum.c b/sys/arch/vax/vax/in_cksum.c
index 79e4e84c85e..0175b9ff593 100644
--- a/sys/arch/vax/vax/in_cksum.c
+++ b/sys/arch/vax/vax/in_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_cksum.c,v 1.3 1997/05/29 00:05:19 niklas Exp $ */
+/* $OpenBSD: in_cksum.c,v 1.4 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: in_cksum.c,v 1.4 1996/10/13 03:35:40 christos Exp $ */
/*
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/ka630.c b/sys/arch/vax/vax/ka630.c
index 3d49bdf033e..7c8a9b47253 100644
--- a/sys/arch/vax/vax/ka630.c
+++ b/sys/arch/vax/vax/ka630.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka630.c,v 1.8 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: ka630.c,v 1.9 2003/06/02 23:27:58 millert Exp $ */
/* $NetBSD: ka630.c,v 1.17 1999/09/06 19:52:52 ragge Exp $ */
/*-
* Copyright (c) 1982, 1988, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/ka650.c b/sys/arch/vax/vax/ka650.c
index 0261ee415cb..5b4dd87f193 100644
--- a/sys/arch/vax/vax/ka650.c
+++ b/sys/arch/vax/vax/ka650.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka650.c,v 1.11 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: ka650.c,v 1.12 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: ka650.c,v 1.25 2001/04/27 15:02:37 ragge Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/ka750.c b/sys/arch/vax/vax/ka750.c
index 07a15d480c2..af12420d0f4 100644
--- a/sys/arch/vax/vax/ka750.c
+++ b/sys/arch/vax/vax/ka750.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka750.c,v 1.9 2002/03/14 01:26:48 millert Exp $ */
+/* $OpenBSD: ka750.c,v 1.10 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: ka750.c,v 1.30 1999/08/14 11:30:48 ragge Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
@@ -13,11 +13,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/ka780.c b/sys/arch/vax/vax/ka780.c
index 335bd359e11..422338a536f 100644
--- a/sys/arch/vax/vax/ka780.c
+++ b/sys/arch/vax/vax/ka780.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka780.c,v 1.8 2002/03/14 03:16:02 millert Exp $ */
+/* $OpenBSD: ka780.c,v 1.9 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: ka780.c,v 1.14 1999/08/07 10:36:49 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/ka820.c b/sys/arch/vax/vax/ka820.c
index be2bbdb8f3e..8092225d8f1 100644
--- a/sys/arch/vax/vax/ka820.c
+++ b/sys/arch/vax/vax/ka820.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka820.c,v 1.10 2003/05/11 19:41:12 deraadt Exp $ */
+/* $OpenBSD: ka820.c,v 1.11 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: ka820.c,v 1.22 2000/06/04 02:19:27 matt Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/ka860.c b/sys/arch/vax/vax/ka860.c
index bc6343c1401..868cc57e35f 100644
--- a/sys/arch/vax/vax/ka860.c
+++ b/sys/arch/vax/vax/ka860.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ka860.c,v 1.7 2002/03/14 03:16:02 millert Exp $ */
+/* $OpenBSD: ka860.c,v 1.8 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: ka860.c,v 1.15 1999/08/07 10:36:49 ragge Exp $ */
/*
* Copyright (c) 1986, 1988 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index b21f9841ca8..c8e9f75da98 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.66 2003/05/14 00:20:37 tedu Exp $ */
+/* $OpenBSD: machdep.c,v 1.67 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: machdep.c,v 1.108 2000/09/13 15:00:23 thorpej Exp $ */
/*
@@ -26,11 +26,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/mem.c b/sys/arch/vax/vax/mem.c
index d99dbed18bb..68f430fa674 100644
--- a/sys/arch/vax/vax/mem.c
+++ b/sys/arch/vax/vax/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.12 2002/04/29 19:13:05 miod Exp $ */
+/* $OpenBSD: mem.c,v 1.13 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: mem.c,v 1.15 1999/03/24 05:51:17 mrg Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/ns_cksum.c b/sys/arch/vax/vax/ns_cksum.c
index a6f2f0a8ff6..53a97ec32ac 100644
--- a/sys/arch/vax/vax/ns_cksum.c
+++ b/sys/arch/vax/vax/ns_cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns_cksum.c,v 1.4 2001/09/20 17:02:31 mpech Exp $ */
+/* $OpenBSD: ns_cksum.c,v 1.5 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: ns_cksum.c,v 1.3 1996/10/13 03:35:55 christos Exp $ */
/*
* Copyright (c) 1985, 1986 Regents of the University of California.
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/rootfil.c b/sys/arch/vax/vax/rootfil.c
index f6d24559da8..a481700a8d2 100644
--- a/sys/arch/vax/vax/rootfil.c
+++ b/sys/arch/vax/vax/rootfil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rootfil.c,v 1.15 2003/05/11 19:41:12 deraadt Exp $ */
+/* $OpenBSD: rootfil.c,v 1.16 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: rootfil.c,v 1.14 1996/10/13 03:35:58 christos Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/udiv.s b/sys/arch/vax/vax/udiv.s
index a26f911939b..f281c33e289 100644
--- a/sys/arch/vax/vax/udiv.s
+++ b/sys/arch/vax/vax/udiv.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: udiv.s,v 1.2 1997/05/29 00:05:26 niklas Exp $ */
+/* $OpenBSD: udiv.s,v 1.3 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: udiv.s,v 1.2 1994/10/26 08:03:34 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/urem.s b/sys/arch/vax/vax/urem.s
index 9c77a40c760..ea50b50c76a 100644
--- a/sys/arch/vax/vax/urem.s
+++ b/sys/arch/vax/vax/urem.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: urem.s,v 1.2 1997/05/29 00:05:27 niklas Exp $ */
+/* $OpenBSD: urem.s,v 1.3 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: urem.s,v 1.2 1994/10/26 08:03:37 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/uvaxII.c b/sys/arch/vax/vax/uvaxII.c
index 84723060357..2db693bc3e6 100644
--- a/sys/arch/vax/vax/uvaxII.c
+++ b/sys/arch/vax/vax/uvaxII.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvaxII.c,v 1.11 2003/05/11 19:41:12 deraadt Exp $ */
+/* $OpenBSD: uvaxII.c,v 1.12 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: uvaxII.c,v 1.10 1996/10/13 03:36:04 christos Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vax/uvax_proto.c b/sys/arch/vax/vax/uvax_proto.c
index adb3b571f9b..d6c877883e8 100644
--- a/sys/arch/vax/vax/uvax_proto.c
+++ b/sys/arch/vax/vax/uvax_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvax_proto.c,v 1.2 1997/05/29 00:05:29 niklas Exp $ */
+/* $OpenBSD: uvax_proto.c,v 1.3 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: uvax_proto.c,v 1.3 1996/10/13 03:36:06 christos Exp $ */
/*-
* Copyright (c) 1982, 1988, 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vsa/dc.c b/sys/arch/vax/vsa/dc.c
index 8f33e5a7da2..8fcdded966e 100644
--- a/sys/arch/vax/vsa/dc.c
+++ b/sys/arch/vax/vsa/dc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dc.c,v 1.8 2002/03/14 03:16:02 millert Exp $ */
+/* $OpenBSD: dc.c,v 1.9 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: dc.c,v 1.4 1996/10/13 03:36:10 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vsa/dc7085cons.h b/sys/arch/vax/vsa/dc7085cons.h
index d3e05ff4429..45e2bf8d019 100644
--- a/sys/arch/vax/vsa/dc7085cons.h
+++ b/sys/arch/vax/vsa/dc7085cons.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dc7085cons.h,v 1.2 1997/05/29 00:05:31 niklas Exp $ */
+/* $OpenBSD: dc7085cons.h,v 1.3 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: dc7085cons.h,v 1.1 1996/07/20 18:55:10 ragge Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/sys/arch/vax/vsa/if_le_vsbus.c b/sys/arch/vax/vsa/if_le_vsbus.c
index 939bc40ce76..a45304038c3 100644
--- a/sys/arch/vax/vsa/if_le_vsbus.c
+++ b/sys/arch/vax/vsa/if_le_vsbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le_vsbus.c,v 1.7 2002/03/14 01:26:49 millert Exp $ */
+/* $OpenBSD: if_le_vsbus.c,v 1.8 2003/06/02 23:27:59 millert Exp $ */
/* $NetBSD: if_le_vsbus.c,v 1.10 2000/06/29 07:14:18 mrg Exp $ */
/*-
@@ -52,11 +52,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*