From: "Vladimir N. Oleynik" <dzo@simtreas.ru>
Date: Thu, 15 Dec 2005 12:01:49 +0000 (-0000)
Subject: sync license from mainstream
X-Git-Tag: 1_1_0~407
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ddc280ec437d61a6d0a906e414e475e05e877606;p=oweals%2Fbusybox.git

sync license from mainstream
---

diff --git a/shell/ash.c b/shell/ash.c
index 171d5ede7..4fc3e0e15 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5,7 +5,7 @@
  * Copyright (c) 1989, 1991, 1993, 1994
  *      The Regents of the University of California.  All rights reserved.
  *
- * Copyright (c) 1997-2003 Herbert Xu <herbert@debian.org>
+ * Copyright (c) 1997-2005 Herbert Xu <herbert@gondor.apana.org.au>
  * was re-ported from NetBSD and debianized.
  *
  *
@@ -13702,11 +13702,7 @@ int main(int argc, char **argv)
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- *              ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
- *
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *