from amd5.3 alpha11

[unix-history] / usr / src / usr.sbin / amd / amd / info_union.c

diff --git a/usr/src/usr.sbin/amd/amd/info_union.c b/usr/src/usr.sbin/amd/amd/info_union.c
index 81f45c8..f33129d 100644 (file)
--- a/usr/src/usr.sbin/amd/amd/info_union.c
+++ b/usr/src/usr.sbin/amd/amd/info_union.c
@@ -9,21 +9,9 @@
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry at Imperial College, London.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * 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
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)info_union.c        5.1 (Berkeley) %G%
+ *     @(#)info_union.c        5.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*