| commit | a4be6c77b5fac7e0446452cc61656e8a01d27276 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 22 12:36:57 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Sep 22 12:36:57 2012 -0700 |
| tree | a6d449a23a10b55b6da2758adab1434ae4437863 | |
| parent | abef3bd71029b80ec1bdd6c6244b5b0b99f56633 [diff] | |
| parent | c73f693989d7a7d99ec66a7065295a0c93d0b127 [diff] |
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