diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 13:54:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 13:54:36 -0700 |
commit | 1957e7fdefce4494cb8d8f09ee2317b7ede24994 (patch) | |
tree | 3a7dc640b6720c857186e59a4a820eae92acbb01 /net/mac80211 | |
parent | ce195d328485459b77672ef20485a8e4f21477b5 (diff) | |
parent | 80975d21aae2136ccae1ce914a1602dc1d8b0795 (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: cope with negative dentries in cifs_get_root
cifs: convert prefixpath delimiters in cifs_build_path_to_root
CIFS: Fix missing a decrement of inFlight value
cifs: demote DFS referral lookup errors to cFYI
Revert "cifs: advertise the right receive buffer size to the server"
Diffstat (limited to 'net/mac80211')
0 files changed, 0 insertions, 0 deletions