diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-27 06:42:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-27 06:42:54 -0400 |
| commit | 69ea8b857782ea56d9db01e2f57f9067abd3f013 (patch) | |
| tree | 1fb0c7cfb9c48de9a181a6e1774fd97143075e3c /arch/arm/mach-omap2/voltage.c | |
| parent | d8cc3972b2178f9fe532306330f76bf51cb0d8bd (diff) | |
| parent | 88627148400e37b4bff197285d348fc05c9de013 (diff) | |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French:
"Four fixes from testing at the recent SMB3 Plugfest including two
important authentication ones (one fixes authentication problems to
some popular servers when clock times differ more than two hours
between systems, the other fixes Kerberos authentication for SMB3)"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
fix encryption error checks on mount
[SMB3] Fix sec=krb5 on smb3 mounts
cifs: use server timestamp for ntlmv2 authentication
disabling oplocks/leases via module parm enable_oplocks broken for SMB3
Diffstat (limited to 'arch/arm/mach-omap2/voltage.c')
0 files changed, 0 insertions, 0 deletions