diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 08:33:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 08:33:59 -0800 |
| commit | c07f62e5f18123103459ff74e86af1518a5b8af5 (patch) | |
| tree | f78ac0b31c730f1c6c3a2dfa08c2944b84a3efb5 /fs/smbfs/proto.h | |
| parent | e5404586a499f7dce915456e85ff94b2df7a3b1c (diff) | |
| parent | ee8a1a0a1a5817accd03ced7e7ffde3a4430f485 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Apple ALU wireless keyboards are bluetooth devices
HID: remove setup mutex, fix possible deadlock
HID: add USB ID for another dual gameron adapter
HID: unignore mouse on unibody macbooks
HID: fix blacklist entries for greenasia/pantherlord
Diffstat (limited to 'fs/smbfs/proto.h')
0 files changed, 0 insertions, 0 deletions