Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2012 16:07:15 +0000 (09:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Mar 2012 16:07:15 +0000 (09:07 -0700)
commit1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5
treec6684be0e98deb7220153c410be7c1fb7cb0dbbf
parentf63d395d47f37a4fe771e6d4b1db9d2cdae5ffc5
parent3dd933061d3a4f33fb6ba1616e88fa55a8b8cb9c
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
fs/cifs/cifsfs.c