diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 21:36:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-22 21:36:57 +0200 |
commit | a4be6c77b5fac7e0446452cc61656e8a01d27276 (patch) | |
tree | a6d449a23a10b55b6da2758adab1434ae4437863 /drivers/hid/Makefile | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
parent | cifs: fix return value in cifsConvertToUTF16 (diff) | |
download | linux-a4be6c77b5fac7e0446452cc61656e8a01d27276.tar.xz linux-a4be6c77b5fac7e0446452cc61656e8a01d27276.zip |
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
Diffstat (limited to 'drivers/hid/Makefile')
0 files changed, 0 insertions, 0 deletions