Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Jan 2011 19:17:51 +0000 (11:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Jan 2011 19:17:51 +0000 (11:17 -0800)
commit1a47f7a84ef386c1f7f55f669598bd9894ceb73a
tree8105fcee8bdbacb06b00cc27e90b631be2290dbb
parentab2020f2f11fc7fb81e6c71298b0830d85412011
parentbd7633195581c7665ce9dd80c665ec93466d1b64
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: add cruid= mount option
  cifs: cFYI the entire error code in map_smb_to_linux_error