tree b33da1ea12f55ad11b547fc723f72b22e1d9cecc
parent a33a052f19a21d727847391c8c1aff3fb221c472
parent d098564f3b2b5d555e51bca765a6a9e0dda8f2cd
author Linus Torvalds <torvalds@linux-foundation.org> 1249424876 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1249424876 -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] 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