diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-21 04:16:12 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-21 04:16:12 +0200 |
commit | b99a9e8776ca837344c6b64d518483fc5d5eefb4 (patch) | |
tree | 66f7534e7bc008f21cb493a706d3d3a670aa12f5 /include/asm-generic | |
parent | Merge tag 'gfs2-4.7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/g... (diff) | |
parent | CIFS: Remove some obsolete comments (diff) | |
download | linux-b99a9e8776ca837344c6b64d518483fc5d5eefb4.tar.xz linux-b99a9e8776ca837344c6b64d518483fc5d5eefb4.zip |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French:
"Two small cifs fixes, including one spnego upcall cifs security fix
for stable"
* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
CIFS: Remove some obsolete comments
cifs: Create dedicated keyring for spnego operations
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions