]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
projects / mirror_ubuntu-disco-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abef3bd c73f693)
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)
Pull cifs fix from Steve French.

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


Trivial merge
Ubuntu Disco kernel mirror for Proxmox VE and PMG