From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Mar 2012 16:07:15 +0000 (-0700)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: MMI-PSA29.97-13-9~17204
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: clean up ordering in exit_cifs
  cifs: clean up call to cifs_dfs_release_automount_timer()
  CIFS: Delete echo_retries module parm
  CIFS: Prepare credits code for a slot reservation
  CIFS: Make wait_for_free_request killable
  CIFS: Introduce credit-based flow control
  CIFS: Simplify inFlight logic
  cifs: fix issue mounting of DFS ROOT when redirecting from one domain controller to the next
  CIFS: Respect negotiated MaxMpxCount
  CIFS: Fix a spurious error in cifs_push_posix_locks
---

1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5