diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-12 11:47:53 -0700 |
| commit | 5145edef1efa16e6947c27c7487fac545e8b5939 (patch) | |
| tree | 835d67bb642027c7abaa62246b450993d250a52f /fs | |
| parent | 451bdbef06b85c4e82538debfd7b295fa08fe501 (diff) | |
| parent | 5d9d49c51678f5e4c37ce661b4573d73fb391040 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase
Conflicts:
drivers/usb/host/ehci-q.c
drivers/usb/host/ehci.h
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index f4af4cc3750..71beb020197 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2018,7 +2018,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info) warned_on_ntlm = true; cERROR(1, "default security mechanism requested. The default " "security mechanism will be upgraded from ntlm to " - "ntlmv2 in kernel release 3.1"); + "ntlmv2 in kernel release 3.2"); } ses->overrideSecFlg = volume_info->secFlg; |