From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Wed, 20 May 2020 17:35:50 +0000 (-0700)
Subject: Remove duplicate zlib license from source comments.
X-Git-Tag: 1.9.9-b1~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae8bf41f272a5792a70c79a96342dd6a366068bd;p=thirdparty%2Fzlib-ng.git

Remove duplicate zlib license from source comments.
---

diff --git a/arch/arm/adler32_neon.c b/arch/arm/adler32_neon.c
index 3e0540cd..b0bcd6ca 100644
--- a/arch/arm/adler32_neon.c
+++ b/arch/arm/adler32_neon.c
@@ -2,19 +2,7 @@
  * Copyright (C) 2017 ARM Holdings Inc.
  * Author: Adenilson Cavalcanti <adenilson.cavalcanti@arm.com>
  *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 1. The origin of this software must not be misrepresented; you must not
- *  claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
+ * For conditions of distribution and use, see copyright notice in zlib.h
  */
 #include "adler32_neon.h"
 #if defined(__ARM_NEON__) || defined(__ARM_NEON)
diff --git a/arch/arm/adler32_neon.h b/arch/arm/adler32_neon.h
index 1cb278c7..f13de953 100644
--- a/arch/arm/adler32_neon.h
+++ b/arch/arm/adler32_neon.h
@@ -2,19 +2,7 @@
  * Copyright (C) 2017 ARM Holdings Inc.
  * Author: Adenilson Cavalcanti <adenilson.cavalcanti@arm.com>
  *
- * This software is provided 'as-is', without any express or implied
- * warranty.  In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 1. The origin of this software must not be misrepresented; you must not
- *  claim that you wrote the original software. If you use this software
- *    in a product, an acknowledgment in the product documentation would be
- *    appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- *    misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
+ * For conditions of distribution and use, see copyright notice in zlib.h
  */
 #ifndef __ADLER32_NEON__
 #define __ADLER32_NEON__