new copyright; att/bsd/shared

SCCS-vsn: sys/hp300/hp300/pmap.c 7.5
SCCS-vsn: sys/hp300/include/remote-sl.h 7.3
SCCS-vsn: sys/tahoe/if/if_acereg.h 7.2
SCCS-vsn: sys/tahoe/if/if_enpreg.h 7.2

diff --git a/usr/src/sys/hp300/hp300/pmap.c b/usr/src/sys/hp300/hp300/pmap.c
index 84b265b..6bc315c 100644 (file)
--- a/usr/src/sys/hp300/hp300/pmap.c
+++ b/usr/src/sys/hp300/hp300/pmap.c
@@ -9,7 +9,7 @@
  * The CMU software License Agreement specifies the terms and conditions
  * for use and redistribution.
  *
  * The CMU software License Agreement specifies the terms and conditions
  * for use and redistribution.
  *

- *     @(#)pmap.c      7.4 (Berkeley) %G%
+ *     @(#)pmap.c      7.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*

diff --git a/usr/src/sys/hp300/include/remote-sl.h b/usr/src/sys/hp300/include/remote-sl.h
index a4fc8d3..5a7e723 100644 (file)
--- a/usr/src/sys/hp300/include/remote-sl.h
+++ b/usr/src/sys/hp300/include/remote-sl.h
@@ -1,21 +1,15 @@
-/*
- * Copyright (c) 1990 Regents of the University of California.
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Lawrence Berkeley Laboratory,
- * Berkeley, CA.  The name of the University may not be used to
- * endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * This code is derived from software contributed to Berkeley by
+ * Steven McCanne of Lawrence Berkeley Laboratory.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)remote-sl.h 7.3 (Berkeley) %G%

  *
  *

- * @(#) $Header: remote-sl.h,v 1.3 91/03/22 15:34:27 mccanne Exp $ (LBL)
+ * $Header: remote-sl.h,v 1.3 91/03/22 15:34:27 mccanne Exp $ (LBL)

  */
 
 #define FRAME_END              0xc0            /* Frame End */
  */
 
 #define FRAME_END              0xc0            /* Frame End */

diff --git a/usr/src/sys/tahoe/if/if_acereg.h b/usr/src/sys/tahoe/if/if_acereg.h
index 10f91d5..da8d44a 100644 (file)
--- a/usr/src/sys/tahoe/if/if_acereg.h
+++ b/usr/src/sys/tahoe/if/if_acereg.h
@@ -1,5 +1,13 @@
-/*
- *     @(#)if_acereg.h 7.1 (Berkeley) %G%
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Computer Consoles Inc.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)if_acereg.h 7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*

diff --git a/usr/src/sys/tahoe/if/if_enpreg.h b/usr/src/sys/tahoe/if/if_enpreg.h
index c6f681a..7b6d8c7 100644 (file)
--- a/usr/src/sys/tahoe/if/if_enpreg.h
+++ b/usr/src/sys/tahoe/if/if_enpreg.h
@@ -1,5 +1,13 @@
-/*
- *     @(#)if_enpreg.h 7.1 (Berkeley) %G%
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Computer Consoles Inc.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)if_enpreg.h 7.2 (Berkeley) %G%

  */
 
 /*     Copyright (c) 1984 by Communication Machinery Corporation
  */
 
 /*     Copyright (c) 1984 by Communication Machinery Corporation