diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 17:17:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-05 17:17:01 -0400 |
| commit | 2e5c36722d4c9c86281f25a1e963a6078c7fce6a (patch) | |
| tree | 373e6d3f2858d69feb9828835e4856bec294d98e /crypto/krng.c | |
| parent | e0a70217107e6f9844628120412cb27bb4cea194 (diff) | |
| parent | c67236281c5d749741f5414103903a7c1b9c4636 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
cifs: make cifs_set_oplock_level() take a cifsInodeInfo pointer
cifs: dereferencing first then checking
cifs: trivial comment fix: tlink_tree is now a rbtree
[CIFS] Cleanup unused variable build warning
cifs: convert tlink_tree to a rbtree
cifs: store pointer to master tlink in superblock (try #2)
cifs: trivial doc fix: note setlease implemented
CIFS: Add cifs_set_oplock_level
FS: cifs, remove unneeded NULL tests
Diffstat (limited to 'crypto/krng.c')
0 files changed, 0 insertions, 0 deletions