Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/sys Pull up following revision(s) (requested by tsutsui i...
details: https://anonhg.NetBSD.org/src/rev/f16eec0e05c4
branches: netbsd-9
changeset: 466356:f16eec0e05c4
user: martin <martin%NetBSD.org@localhost>
date: Wed Dec 18 20:04:32 2019 +0000
description:
Pull up following revision(s) (requested by tsutsui in ticket #570):
sys/compat/netbsd32/netbsd32_compat_50_sysv.c: revision 1.3
sys/dev/raidframe/rf_compat50.h: revision 1.6
sys/arch/emips/emips/bus_space.c: revision 1.3
sys/compat/net/if.h: revision 1.5
sys/arch/emips/stand/common/bootinfo.c: revision 1.2
sys/compat/common/sysv_msg_50.c: revision 1.5
sys/compat/common/kern_time_30.c: revision 1.8
sys/arch/emips/stand/common/bootinfo.h: revision 1.2
sys/arch/ia64/include/bus.h: revision 1.4
sys/arch/ia64/ia64/bus_space.c: revision 1.2
sys/compat/common/sysv_shm_50.c: revision 1.5
sys/dev/ic/adw.h: revision 1.15
sys/compat/common/uipc_syscalls_50.c: revision 1.10
sys/arch/emips/ebus/flash_ebus.c: revision 1.22
sys/dev/ic/adv.h: revision 1.15
sys/dev/ic/adwmcode.c: revision 1.18
sys/dev/ic/advlib.c: revision 1.29
sys/arch/hpcarm/include/kloader.h: revision 1.3
sys/dev/usb/uberry.c: revision 1.16
sys/compat/common/sysv_sem_50.c: revision 1.5
sys/compat/netbsd32/netbsd32_compat_50.c: revision 1.43
sys/dev/ic/advlib.h: revision 1.21
sys/dev/ic/adv.c: revision 1.50
sys/compat/netinet6/in6_var.h: revision 1.5
sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm: revision 1.2
sys/arch/emips/include/loadfile_machdep.h: revision 1.3
sys/arch/emips/stand/common/prom_iface.c: revision 1.7
sys/dev/ic/adw.c: revision 1.56
sys/dev/ic/adwmcode.h: revision 1.12
sys/dev/ic/advmcode.c: revision 1.10
sys/arch/emips/ebus/ace_ebus.c: revision 1.22
sys/compat/netbsd32/netbsd32_compat_60.c: revision 1.5
sys/dev/raidframe/rf_compat50.c: revision 1.13
sys/arch/x68k/dev/intiovar.h: revision 1.15
sys/dev/usb/uipad.c: revision 1.8
sys/arch/zaurus/include/kloader.h: revision 1.3
sys/arch/emips/stand/common/bootxx.c: revision 1.2
sys/dev/ic/adwlib.h: revision 1.23
sys/dev/ic/adwlib.c: revision 1.44
sys/compat/netbsd32/netbsd32_compat_16.c: revision 1.3
sys/arch/amigappc/include/intr.h: revision 1.27
sys/arch/x68k/dev/mfp.c: revision 1.27
sys/arch/arm/at91/at91dbgu.c: revision 1.17
sys/dev/ic/advmcode.h: revision 1.7
sys/compat/ultrix/ultrix_exec.h: revision 1.7
sys/compat/common/vfs_syscalls_50.c: revision 1.24
sys/arch/mips/cavium/octeon_dma.c: revision 1.3
sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm: revision 1.2
Remove clause 3 and 4 from TNF licenses.
Ok'ed by martin@ in PR/54760.
Remove clause 3 and 4 leftovers from TNF licenses in more sources.
Confirmed by martin@ in PR/54760.
diffstat:
sys/arch/amigappc/include/intr.h | 9 +--------
sys/arch/arm/at91/at91dbgu.c | 13 +++----------
sys/arch/emips/ebus/ace_ebus.c | 11 ++---------
sys/arch/emips/ebus/flash_ebus.c | 11 ++---------
sys/arch/emips/emips/bus_space.c | 11 ++---------
sys/arch/emips/include/loadfile_machdep.h | 9 +--------
sys/arch/emips/stand/common/bootinfo.c | 9 +--------
sys/arch/emips/stand/common/bootinfo.h | 9 +--------
sys/arch/emips/stand/common/bootxx.c | 9 +--------
sys/arch/emips/stand/common/prom_iface.c | 7 -------
sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm | 9 +--------
sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm | 9 +--------
sys/arch/hpcarm/include/kloader.h | 9 +--------
sys/arch/ia64/ia64/bus_space.c | 11 ++---------
sys/arch/ia64/include/bus.h | 9 +--------
sys/arch/mips/cavium/octeon_dma.c | 11 ++---------
sys/arch/x68k/dev/intiovar.h | 8 +-------
sys/arch/x68k/dev/mfp.c | 10 ++--------
sys/arch/zaurus/include/kloader.h | 9 +--------
sys/compat/common/kern_time_30.c | 11 ++---------
sys/compat/common/sysv_msg_50.c | 11 ++---------
sys/compat/common/sysv_sem_50.c | 11 ++---------
sys/compat/common/sysv_shm_50.c | 11 ++---------
sys/compat/common/uipc_syscalls_50.c | 9 +--------
sys/compat/common/vfs_syscalls_50.c | 11 ++---------
sys/compat/net/if.h | 9 +--------
sys/compat/netbsd32/netbsd32_compat_16.c | 11 ++---------
sys/compat/netbsd32/netbsd32_compat_50.c | 11 ++---------
sys/compat/netbsd32/netbsd32_compat_50_sysv.c | 11 ++---------
sys/compat/netbsd32/netbsd32_compat_60.c | 11 ++---------
sys/compat/netinet6/in6_var.h | 9 +--------
sys/compat/ultrix/ultrix_exec.h | 8 +-------
sys/dev/ic/adv.c | 11 ++---------
sys/dev/ic/adv.h | 9 +--------
sys/dev/ic/advlib.c | 11 ++---------
sys/dev/ic/advlib.h | 9 +--------
sys/dev/ic/advmcode.c | 11 ++---------
sys/dev/ic/advmcode.h | 9 +--------
sys/dev/ic/adw.c | 11 ++---------
sys/dev/ic/adw.h | 9 +--------
sys/dev/ic/adwlib.c | 11 ++---------
sys/dev/ic/adwlib.h | 9 +--------
sys/dev/ic/adwmcode.c | 11 ++---------
sys/dev/ic/adwmcode.h | 9 +--------
sys/dev/raidframe/rf_compat50.c | 9 +--------
sys/dev/raidframe/rf_compat50.h | 9 +--------
sys/dev/usb/uberry.c | 11 ++---------
sys/dev/usb/uipad.c | 11 ++---------
48 files changed, 72 insertions(+), 405 deletions(-)
diffs (truncated from 1313 to 300 lines):
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/amigappc/include/intr.h
--- a/sys/arch/amigappc/include/intr.h Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/amigappc/include/intr.h Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.26 2011/06/19 08:00:56 matt Exp $ */
+/* $NetBSD: intr.h,v 1.26.58.1 2019/12/18 20:04:34 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/arm/at91/at91dbgu.c
--- a/sys/arch/arm/at91/at91dbgu.c Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/arm/at91/at91dbgu.c Wed Dec 18 20:04:32 2019 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91dbgu.c,v 1.15 2015/09/21 13:31:30 skrll Exp $ */
-/* $NetBSD: at91dbgu.c,v 1.15 2015/09/21 13:31:30 skrll Exp $ */
+/* $Id: at91dbgu.c,v 1.15.22.1 2019/12/18 20:04:34 martin Exp $ */
+/* $NetBSD: at91dbgu.c,v 1.15.22.1 2019/12/18 20:04:34 martin Exp $ */
/*
*
@@ -26,13 +26,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -83,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.15 2015/09/21 13:31:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.15.22.1 2019/12/18 20:04:34 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/emips/ebus/ace_ebus.c
--- a/sys/arch/emips/ebus/ace_ebus.c Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/emips/ebus/ace_ebus.c Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ace_ebus.c,v 1.20.20.1 2019/12/08 14:43:16 martin Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.20.20.2 2019/12/18 20:04:33 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.20.20.1 2019/12/08 14:43:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.20.20.2 2019/12/18 20:04:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1501,13 +1501,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/emips/ebus/flash_ebus.c
--- a/sys/arch/emips/ebus/flash_ebus.c Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/emips/ebus/flash_ebus.c Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_ebus.c,v 1.20.8.1 2019/12/08 14:43:16 martin Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.20.8.2 2019/12/18 20:04:33 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20.8.1 2019/12/08 14:43:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.20.8.2 2019/12/18 20:04:33 martin Exp $");
/* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
* Extended to include the Intel JS28F256P30T95.
@@ -1341,13 +1341,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/emips/emips/bus_space.c
--- a/sys/arch/emips/emips/bus_space.c Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/emips/emips/bus_space.c Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.c,v 1.2 2012/02/12 16:34:07 matt Exp $ */
+/* $NetBSD: bus_space.c,v 1.2.52.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -42,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.2 2012/02/12 16:34:07 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.2.52.1 2019/12/18 20:04:32 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/emips/include/loadfile_machdep.h
--- a/sys/arch/emips/include/loadfile_machdep.h Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/emips/include/loadfile_machdep.h Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.2 2014/08/06 21:57:49 joerg Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.2.32.1 2019/12/18 20:04:34 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/emips/stand/common/bootinfo.c
--- a/sys/arch/emips/stand/common/bootinfo.c Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/emips/stand/common/bootinfo.c Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.c,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: bootinfo.c,v 1.1.66.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/emips/stand/common/bootinfo.h
--- a/sys/arch/emips/stand/common/bootinfo.h Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/emips/stand/common/bootinfo.h Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: bootinfo.h,v 1.1.66.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/emips/stand/common/bootxx.c
--- a/sys/arch/emips/stand/common/bootxx.c Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/emips/stand/common/bootxx.c Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.1 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: bootxx.c,v 1.1.66.1 2019/12/18 20:04:32 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -15,13 +15,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/emips/stand/common/prom_iface.c
--- a/sys/arch/emips/stand/common/prom_iface.c Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/emips/stand/common/prom_iface.c Wed Dec 18 20:04:32 2019 +0000
@@ -11,13 +11,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm
--- a/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/hpc/stand/hpcboot/arm/arm_pxa2x0_asm.asm Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-; $NetBSD: arm_pxa2x0_asm.asm,v 1.1 2010/04/06 16:20:28 nonaka Exp $
+; $NetBSD: arm_pxa2x0_asm.asm,v 1.1.70.1 2019/12/18 20:04:33 martin Exp $
;
; Copyright (c) 2001 The NetBSD Foundation, Inc.
; All rights reserved.
@@ -14,13 +14,6 @@
; 2. Redistributions in binary form must reproduce the above copyright
; notice, this list of conditions and the following disclaimer in the
; documentation and/or other materials provided with the distribution.
-; 3. All advertising materials mentioning features or use of this software
-; must display the following acknowledgement:
-; This product includes software developed by the NetBSD
-; Foundation, Inc. and its contributors.
-; 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
; ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 09c168416359 -r f16eec0e05c4 sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm
--- a/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm Tue Dec 17 16:14:25 2019 +0000
+++ b/sys/arch/hpc/stand/hpcboot/arm/arm_sa1100_asm.asm Wed Dec 18 20:04:32 2019 +0000
@@ -1,4 +1,4 @@
-; $NetBSD: arm_sa1100_asm.asm,v 1.1 2010/04/06 16:20:28 nonaka Exp $
+; $NetBSD: arm_sa1100_asm.asm,v 1.1.70.1 2019/12/18 20:04:33 martin Exp $
;
; Copyright (c) 2001 The NetBSD Foundation, Inc.
; All rights reserved.
@@ -14,13 +14,6 @@
; 2. Redistributions in binary form must reproduce the above copyright
; notice, this list of conditions and the following disclaimer in the
; documentation and/or other materials provided with the distribution.
-; 3. All advertising materials mentioning features or use of this software
-; must display the following acknowledgement:
Home |
Main Index |
Thread Index |
Old Index