diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 18:21:14 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 18:21:14 -0800 |
commit | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (patch) | |
tree | eb4eee66ed54915fab3e75781affbefb402d6a11 /include/linux/can | |
parent | 1737ef7598d3515fdc11cb9ba7e054f334404e04 (diff) | |
parent | a9ac49d303f967be0dabd97cb722c4a13109c6c2 (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 sure we allocate enough storage for socket address
[CIFS] Make socket retry timeouts consistent between blocking and nonblocking cases
[CIFS] some cleanup to dir.c prior to addition of posix_open
[CIFS] revalidate parent inode when rmdir done within that directory
[CIFS] Rename md5 functions to avoid collision with new rt modules
cifs: turn smb_send into a wrapper around smb_sendv
Diffstat (limited to 'include/linux/can')
0 files changed, 0 insertions, 0 deletions