tree 3a7dc640b6720c857186e59a4a820eae92acbb01
parent ce195d328485459b77672ef20485a8e4f21477b5
parent 80975d21aae2136ccae1ce914a1602dc1d8b0795
author Linus Torvalds <torvalds@linux-foundation.org> 1312664076 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1312664076 -0700

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"