]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc32fd666c3c216e89d9538360499ba35bc718ee5
treecce1de413b60cfd313329b4f421451ef92a12fdb
parent93b30d53563f5d9ddf63e9ac365bbaff4b20e6e8
parentef1223e1658557a8919e2fed38628fe06039838c
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