From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Feb 2011 22:57:39 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b4f5c46245cf4ca437849c0d04c176b4c150622d;p=linux-beck.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 cifs version
  cifs: Fix regression in LANMAN (LM) auth code
  cifs: fix handling of scopeid in cifs_convert_address
---

b4f5c46245cf4ca437849c0d04c176b4c150622d