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)
commita4be6c77b5fac7e0446452cc61656e8a01d27276
treea6d449a23a10b55b6da2758adab1434ae4437863
parentabef3bd71029b80ec1bdd6c6244b5b0b99f56633
parentc73f693989d7a7d99ec66a7065295a0c93d0b127
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