From b9b94cdd0a05ff3cba661fda58279e4bdc74db5c Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Wed, 1 Dec 2004 18:56:39 +0000
Subject: merge from merge4 to merge5

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ChangeLog')

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
-- 
cgit v1.2.3