Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6

Browse source

...

This commit is contained in:

Steve French 2012-01-18 15:12:04 -06:00

parent dcd169b761 789b4588da

commit 34f598ca08

8 changed files with 312 additions and 63 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

11

fs/cifs/cifs_debug.c

View file

10

fs/cifs/cifs_spnego.c

View file

11

fs/cifs/cifsencrypt.c

View file

307

fs/cifs/connect.c

View file

3

include/keys/user-type.h

View file

1

security/keys/internal.h

View file

1

security/keys/key.c

View file

37

security/keys/user_defined.c

View file