merge from merge4 to merge5
diff --git a/ChangeLog b/ChangeLog
index 63f8b58..5ec4bac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 	* kernel: no allocation on write in direct_io mode
 
+	* move linux/fuse.h to fuse_kernel.h
+
 2004-11-30  Miklos Szeredi <miklos@szeredi.hu>
 
 	* kernel: clean up reading functions