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

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index a5941872d3f7..d705500aa283 100644
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -5023,7 +5023,7 @@ SetEARetry:
         parm_data->list_len = cpu_to_le32(count);
         parm_data->list[0].EA_flags = 0;
         /* we checked above that name len is less than 255 */
-        parm_data->list[0].name_len = (__u8)name_len;;
+        parm_data->list[0].name_len = (__u8)name_len;
         /* EA names are always ASCII */
         if(ea_name)
                 strncpy(parm_data->list[0].name,ea_name,name_len);