Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[safe/jmp/linux-2.6] / fs / cifs / CHANGES

diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES
index 7b2600b..bc0025c 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