From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Aug 2009 22:27:56 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.31-rc6~82
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=849c9caa60642095060e9c21f14687ae9149a6f3;p=~shefty%2Frdma-dev.git

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] Update readme to reflect forceuid mount parms
  cifs: Read buffer overflow
  cifs: show noforceuid/noforcegid mount options (try #2)
  cifs: reinstate original behavior when uid=/gid= options are specified
  [CIFS] Updates fs/cifs/CHANGES
  cifs: fix error handling in mount-time DFS referral chasing code
---

849c9caa60642095060e9c21f14687ae9149a6f3