Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Feb 2011 22:57:39 +0000 (14:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Feb 2011 22:57:39 +0000 (14:57 -0800)
commitb4f5c46245cf4ca437849c0d04c176b4c150622d
treecce1de413b60cfd313329b4f421451ef92a12fdb
parent97b9c3e145a1ddb5a9d8115c82a8981b3f13cba2
parenteed9e8307e01d6d8d6170afcb2f00e1a471b87d4
Merge git://git./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