Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

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

diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index 7b2600b380d7c74f4aa398378012cf1e8bccfed7..bc0025cdd1c9c0d285c32e8d7656103868126ca8 100644 (file)
--- a/fs/cifs/CHANGES
+++ b/fs/cifs/CHANGES
@@ -1,3 +1,8 @@
+Version 1.62
+------------
+Add sockopt=TCP_NODELAY mount option. EA (xattr) routines hardened
+to more strictly handle corrupt frames.
+
 Version 1.61
 ------------
 Fix append problem to Samba servers (files opened with O_APPEND could