]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Sep 2012 19:36:57 +0000 (12:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Sep 2012 19:36:57 +0000 (12:36 -0700)
commite2236b7384f38b92c78939f02a66c7a3d8e13698
treea6d449a23a10b55b6da2758adab1434ae4437863
parent089425d82052aa39d7960cea44e2bdb935b1fdcb
parent6318bee805c5b4ced1d207a4ffa7a7f9a5ffa1e9
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fix from Steve French.

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix return value in cifsConvertToUTF16