Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[~andy/linux] / fs / cifs / CHANGES

diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index 3e0fcc394810d598f0ca4ae5775e8f31ad24a911..8a2de038882e32bb881e53c92171e5967e073a42 100644 (file)
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -178,7 +178,7 @@ improperly zeroed buffer in CIFS Unix extensions set times call.
 Version 1.25
 ------------
 Fix internationalization problem in cifs readdir with filenames that map to 
-longer UTF8 strings than the string on the wire was in Unicode.  Add workaround
+longer UTF-8 strings than the string on the wire was in Unicode.  Add workaround
 for readdir to netapp servers. Fix search rewind (seek into readdir to return 
 non-consecutive entries).  Do not do readdir when server negotiates 
 buffer size to small to fit filename. Add support for reading POSIX ACLs from