diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-31 02:02:08 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-31 02:02:08 +0100 |
commit | 4222721ebb50a8640860eeca0caeb63fe1cce935 (patch) | |
tree | d67acdb4315e611fadc64975fd1467b2389d412d /drivers/pcmcia/sa1111_generic.h | |
parent | [PATCH] IPMI: fix timeout list handling (diff) | |
parent | HID: fix pb_fnmode and move it to generic HID (diff) | |
download | linux-4222721ebb50a8640860eeca0caeb63fe1cce935.tar.xz linux-4222721ebb50a8640860eeca0caeb63fe1cce935.zip |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
HID: fix pb_fnmode and move it to generic HID
HID: fix hid-input mapping for Firefly Mini Remote Control
USB HID: fix hid_blacklist clash for 0x08ca/0x0010
HID: fix memleaking of collection
Diffstat (limited to 'drivers/pcmcia/sa1111_generic.h')
0 files changed, 0 insertions, 0 deletions