From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Sep 2012 19:36:57 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.6-rc7~9
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4be6c77b5fac7e0446452cc61656e8a01d27276;p=pandora-kernel.git

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
---

a4be6c77b5fac7e0446452cc61656e8a01d27276