1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b775cb85..1d92ddd1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-05  Peter Stephenson  <pws@csr.com>
+
+	* Joel Smith <jsmith@caldera.com>: 13230: Src/exec.c, Src/glob.c,
+	Src/lex.c, Src/parse.c, Src/text.c, Src/zsh.h: avoid name clashes
+	with Linux kernel.
+
 2000-12-04  Bart Schaefer  <schaefer@zsh.org>
 
 	* 13229: Doc/Makefile.in: Include mod_term*.yo in MODDOCSRC.