From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 17 Jan 2011 19:17:51 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.38-rc1~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1a47f7a84ef386c1f7f55f669598bd9894ceb73a;p=users%2Fjedix%2Flinux-maple.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: add cruid= mount option
  cifs: cFYI the entire error code in map_smb_to_linux_error
---

1a47f7a84ef386c1f7f55f669598bd9894ceb73a